organizing

pull/1/head
Kaleb Himes 2014-05-22 15:05:31 -06:00
parent 6c00d95e27
commit 0abd32a97c
8 changed files with 308 additions and 19 deletions

View File

View File

@ -9,15 +9,13 @@ OBJ = echoserver.o
#LIBS=-lsocket
%.o: %.c $(DEPS)
$(CC) -c -o $@ $< $(CFLAGS)
all: server-udp server-dtls
all: server
server-udp: server-udp.c
$(CC) -Wall -o server-udp server-udp.c -I ../include -lcyassl
server: server-dtls.c
$(CC) -Wall -DCYASSL_DTLS -o server server-dtls.c -I ../include -lcyassl
server-dtls: server-dtls.c
$(CC) -Wall -DCYASSL_DTLS -o server-dtls server-dtls.c -I ../include -lcyassl
.PHONY: clean
clean:
-rm -f *.o server-udp server-dtls
-rm -f *.o server

View File

@ -92,25 +92,25 @@ int main(int argc, char** argv)
}
printf("CTX set to DTLS 1.2\n");
if (CyaSSL_CTX_load_verify_locations(ctx,"certs/ca-cert.pem",0) !=
if (CyaSSL_CTX_load_verify_locations(ctx,"../certs/ca-cert.pem",0) !=
SSL_SUCCESS) {
fprintf(stderr, "Error loading certs/ca-cert.pem, "
fprintf(stderr, "Error loading ../certs/ca-cert.pem, "
"please check the file.\n");
exit(EXIT_FAILURE);
}
printf("Loaded CA certs\n");
if (CyaSSL_CTX_use_certificate_file(ctx,"certs/server-cert.pem",
if (CyaSSL_CTX_use_certificate_file(ctx,"../certs/server-cert.pem",
SSL_FILETYPE_PEM) != SSL_SUCCESS) {
fprintf(stderr, "Error loading certs/server-cert.pem, "
fprintf(stderr, "Error loading ../certs/server-cert.pem, "
"please check the file.\n");
exit(EXIT_FAILURE);
}
printf("Loaded server certs\n");
if (CyaSSL_CTX_use_PrivateKey_file(ctx,"certs/server-key.pem",
if (CyaSSL_CTX_use_PrivateKey_file(ctx,"../certs/server-key.pem",
SSL_FILETYPE_PEM) != SSL_SUCCESS) {
fprintf(stderr, "Error loading certs/server-key.pem, "
fprintf(stderr, "Error loading ../certs/server-key.pem, "
"please check the file.\n");
exit(EXIT_FAILURE);
}

View File

@ -0,0 +1,21 @@
DEPS = ../include/unp.h
CC=gcc
CFLAGS=-Wall -I ../include -DCYASSL_DTLS
OBJ = echoserver.o
#if you are on a sunOS (System V) machine, you'll need to uncomment
#the next line.
#LIBS=-lsocket
%.o: %.c $(DEPS)
$(CC) -c -o $@ $< $(CFLAGS)
all: server
server: server-dtls-nonblocking.c
$(CC) -Wall -DCYASSL_DTLS -o server server-dtls-nonblocking.c -I ../include -lcyassl
.PHONY: clean
clean:
-rm -f *.o server

View File

@ -0,0 +1,257 @@
/* server-dtls.c
*
* Copyright (C) 2006-2014 wolfSSL Inc.
*
* This file is part of CyaSSL.
*
* CyaSSL is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* CyaSSL is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA
*=============================================================================
*
* Bare-bones example of a DTLS server for instructional/learning purposes.
* Utilizes DTLS 1.2.
*/
#include <stdio.h> /* standard in/out procedures */
#include <stdlib.h> /* defines system calls */
#include <string.h> /* necessary for memset */
#include <netdb.h>
#include <sys/socket.h> /* used for all socket calls */
#include <netinet/in.h> /* used for sockaddr_in */
#include <arpa/inet.h>
#include <cyassl/ssl.h>
#include <errno.h>
#include <signal.h>
#include <unistd.h>
#define SERV_PORT 11111 /* define our server port number */
#define MSGLEN 4096
static int cleanup; /* To handle shutdown */
void sig_handler(const int sig)
{
printf("\nSIGINT handled.\n");
cleanup = 1;
exit(0);
}
static void err_sys(const char* msg)
{
printf("error: %s\n", msg);
if (msg)
exit(EXIT_FAILURE);
}
int main(int argc, char** argv)
{
/* CREATE THE SOCKET */
char ack[] = "I hear you fashizzle!";
struct sockaddr_in servaddr; /* our server's address */
struct sockaddr_in cliaddr; /* the client's address */
int listenfd = 0; /* Initialize our socket */
socklen_t clilen; /* length of address' */
int recvlen = 0; /* length of message */
char buff[MSGLEN]; /* the incoming message */
struct sigaction act, oact; /* structures for signal handling */
/*
* Define a signal handler for when the user closes the program
* with Ctrl-C. Also, turn off SA_RESTART so that the OS doesn't
* restart the call to accept() after the signal is handled.
*/
act.sa_handler = sig_handler;
sigemptyset(&act.sa_mask);
act.sa_flags = 0;
sigaction(SIGINT, &act, &oact);
CyaSSL_Debugging_ON();
CyaSSL_Init(); /* Initialize CyaSSL */
CYASSL_CTX* ctx;
if ( (ctx = CyaSSL_CTX_new(CyaDTLSv1_2_server_method())) == NULL){
fprintf(stderr, "CyaSSL_CTX_new error.\n");
exit(EXIT_FAILURE);
}
printf("CTX set to DTLS 1.2\n");
if (CyaSSL_CTX_load_verify_locations(ctx,"../certs/ca-cert.pem",0) !=
SSL_SUCCESS) {
fprintf(stderr, "Error loading ../certs/ca-cert.pem, "
"please check the file.\n");
exit(EXIT_FAILURE);
}
printf("Loaded CA certs\n");
if (CyaSSL_CTX_use_certificate_file(ctx,"../certs/server-cert.pem",
SSL_FILETYPE_PEM) != SSL_SUCCESS) {
fprintf(stderr, "Error loading ../certs/server-cert.pem, "
"please check the file.\n");
exit(EXIT_FAILURE);
}
printf("Loaded server certs\n");
if (CyaSSL_CTX_use_PrivateKey_file(ctx,"../certs/server-key.pem",
SSL_FILETYPE_PEM) != SSL_SUCCESS) {
fprintf(stderr, "Error loading ../certs/server-key.pem, "
"please check the file.\n");
exit(EXIT_FAILURE);
}
printf("Loaded server keys\n");
/* BEGIN: avoid valgrind error when using DTLS v1.2 and AES */
int ret;
ret = CyaSSL_CTX_set_cipher_list(ctx, "DES-CBC3-SHA");
if(ret == SSL_SUCCESS)
printf("ret successfully set to \"DES-CBC3-SHA\"\n");
/* END: avoid valgrind error */
while (cleanup != 1) {
if ( (listenfd = socket(AF_INET, SOCK_DGRAM, 0) ) < 0 ) {
err_sys("cannot create socket");
return 0;
}
printf("Socket allocated\n");
/* INADDR_ANY=IPaddr, socket = 11111, modify SERV_PORT to change */
memset((char *)&servaddr, 0, sizeof(servaddr));
/* host-to-network-long conversion (htonl) */
/* host-to-network-short conversion (htons) */
servaddr.sin_family = AF_INET;
servaddr.sin_addr.s_addr = htonl(INADDR_ANY);
servaddr.sin_port = htons(SERV_PORT);
/* Eliminate socket already in use error */
int res = 1;
int on = 1;
socklen_t len = sizeof(on);
res = setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, &on, len);
if (res < 0) {
err_sys("setsockopt SO_REUSEADDR failed\n");
}
/*Bind Socket*/
if (bind(listenfd, (struct sockaddr *)&servaddr, sizeof(servaddr)) < 0) {
err_sys("bind failed");
return 0;
}
printf("Socket bind complete\n");
printf("Awaiting client connection on port %d\n", SERV_PORT);
CYASSL* ssl; /* initialize arg */
clilen = sizeof(cliaddr); /* set clilen to |cliaddr| */
unsigned char b[1500];
int connfd = 0;
connfd = (int)recvfrom(listenfd, (char *)&b, sizeof(b), MSG_PEEK,
(struct sockaddr*)&cliaddr, &clilen);
if (connfd < 0){
printf("No clients in que, enter idle state\n");
continue;
}
else if (connfd > 0) {
if (connect(listenfd, (const struct sockaddr *)&cliaddr,
sizeof(cliaddr)) != 0)
err_sys("udp connect failed");
}
else err_sys("recvfrom failed");
printf("Connected!\n");
/* Create the CYASSL Object */
if (( ssl = CyaSSL_new(ctx) ) == NULL) {
fprintf(stderr, "CyaSSL_new error.\n");
exit(EXIT_FAILURE);
}
/******/printf("STEP 1\n");
/* set the session ssl to client connection port */
CyaSSL_set_fd(ssl, listenfd);
/******/printf("STEP 2\n");
if (CyaSSL_accept(ssl) != SSL_SUCCESS) {
int err = CyaSSL_get_error(ssl, 0);
char buffer[80];
printf("error = %d, %s\n", err, CyaSSL_ERR_error_string(err, buffer));
buffer[80]= 0;
err_sys("SSL_accept failed\n");
}
/*******/printf("STEP 3\n");
if (( recvlen = CyaSSL_read(ssl, buff, sizeof(buff)-1)) > 0){
printf("heard %d bytes\n", recvlen);
buff[recvlen] = 0;
printf("I heard this: \"%s\"\n", buff);
}
/*******/printf("STEP 4\n");
if (recvlen < 0) {
int readErr = CyaSSL_get_error(ssl, 0);
if(readErr != SSL_ERROR_WANT_READ)
err_sys("SSL_read failed");
}
/******/printf("STEP 5\n");
if (CyaSSL_write(ssl, ack, sizeof(ack)) < 0) {
err_sys("CyaSSL_write fail");
}
else
printf("lost the connection to client\n");
printf("reply sent \"%s\"\n", ack);
CyaSSL_set_fd(ssl, 0);
CyaSSL_shutdown(ssl);
CyaSSL_free(ssl);
printf("Client left return to idle state\n");
continue;
}
CyaSSL_CTX_free(ctx);
return(0);
}

View File

@ -1,7 +0,0 @@
!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/
!_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/
!_TAG_PROGRAM_AUTHOR Darren Hiebert /dhiebert@users.sourceforge.net/
!_TAG_PROGRAM_NAME Exuberant Ctags //
!_TAG_PROGRAM_URL http://ctags.sourceforge.net /official site/
!_TAG_PROGRAM_VERSION 5.9~svn20110310 //
main server-udp.c /^main(void)$/;" f

View File

@ -0,0 +1,20 @@
DEPS = ../include/unp.h
CC=gcc
CFLAGS=-Wall -I ../include -DCYASSL_DTLS
OBJ = echoserver.o
#if you are on a sunOS (System V) machine, you'll need to uncomment
#the next line.
#LIBS=-lsocket
%.o: %.c $(DEPS)
$(CC) -c -o $@ $< $(CFLAGS)
all: server
server: server-udp.c
$(CC) -Wall -o server server-udp.c -I ../include -lcyassl
.PHONY: clean
clean:
-rm -f *.o server