implemented server accept and handshake read based on libev

Author: jeremyhahn

LICENSE

@@ -1,165 +1,21 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
+The MIT License (MIT)
+
+Copyright (c) 2014 Jeremy Hahn
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

Makefile.am

@@ -4,22 +4,11 @@ bin_PROGRAMS = websocket-client websocket-server
 websocket_client_SOURCES = src/cwebsocket/utf8.h src/cwebsocket/common.h src/cwebsocket/common.c src/cwebsocket/utf8.c src/cwebsocket/client.h src/cwebsocket/client.c src/websocket-client.c
 websocket_server_SOURCES = src/cwebsocket/utf8.h src/cwebsocket/common.h src/cwebsocket/common.c src/cwebsocket/utf8.c src/cwebsocket/server.h src/cwebsocket/server.c src/websocket-server.c
 
-#LDFLAGS = -L/usr/local/lib -lcrypto
+AM_CFLAGS= -Wall -O3
+LDFLAGS=
 
 if DEBUG
-  AM_CFLAGS = -Wall -g3
-else
-  AM_CFLAGS = -Wall -03
-endif
-
-if THREADED
-  AM_CFLAGS += -pthread -DTHREADED
-  LDFLAGS += -lpthread
-endif
-
-if USESSL
-  AM_CFLAGS += -DUSESSL
-  LDFLAGS += -lssl
+  AM_CFLAGS += -g3
 endif
 
 clean:

README.md

@@ -6,7 +6,7 @@
 
 The goal of cwebsocket is to provide a simple, lightweight, high performance websocket client/server optimized for low power embedded systems.
 
-cwebsocket is currently in a development state. You may encounter bugs. Report them in the issues section for a timely fix.
+cwebsocket is currently in a development state. You may encounter bugs. Report them for a timely fix.
 
 Successful tests have been conducted on the following architectures:
 
@@ -22,18 +22,20 @@ cwebsocket is compliant with the following standards:
 
 ### Build
 
-By default, cwebsocket is built with SSL support for multi-threaded, 64-bit architectures. To build, run:
+By defaults, cwebsocket is built with multi-threading and SSL support. 
+
+To build, run:
 
 	./autogen.sh
 	./configure
 	make
 	sudo make install
 
-Without threads:
+To built without multi-threading:
 
 	./configure --enable-threads=no
 
-Without SSL:
+To build without SSL:
 
 	./configure --enable-ssl=no
 

configure.ac

@@ -32,6 +32,10 @@ AC_CHECK_LIB([pthread], [main],, AC_MSG_ERROR($missing_library))
 PKG_CHECK_MODULES([pthread], [pthread], [have_libpthread=yes], [have_libpthread=no])
 AM_CONDITIONAL([PTHREAD],  [test "$have_libpthread" = "yes"])
 
+AC_CHECK_LIB([ev], [main],, AC_MSG_ERROR($missing_library))
+PKG_CHECK_MODULES([ev], [ev], [have_libev=yes], [have_libev=no])
+AM_CONDITIONAL([EV],  [test "$have_libev" = "yes"])
+
 # Checks for header files.
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/socket.h sys/time.h syslog.h unistd.h])
 

src/cwebsocket/client.h

@@ -34,16 +34,6 @@
 #include <sys/resource.h>
 #include "common.h"
 
-#ifdef USESSL
-	#include <openssl/rand.h>
-	#include <openssl/ssl.h>
-	#include <openssl/err.h>
-#endif
-
-#ifdef THREADED
-	#include <pthread.h>
-#endif
-
 #define WEBSOCKET_STATE_CONNECTING   (1 << 0)
 #define WEBSOCKET_STATE_CONNECTED    (1 << 1)
 #define WEBSOCKET_STATE_OPEN         (1 << 2)

src/cwebsocket/common.h

@@ -42,6 +42,16 @@
 #include <openssl/buffer.h>
 #include "utf8.h"
 
+#ifdef USESSL
+	#include <openssl/rand.h>
+	#include <openssl/ssl.h>
+	#include <openssl/err.h>
+#endif
+
+#ifdef THREADED
+	#include <pthread.h>
+#endif
+
 #ifndef HANDSHAKE_BUFFER_MAX
 	#define HANDSHAKE_BUFFER_MAX 256  // bytes
 #endif

src/cwebsocket/server.c

@@ -27,12 +27,7 @@
 int cwebsocket_connect(cwebsocket_server *websocket) {
 
 	struct sockaddr_in srvaddr;
-
-	char buffer[DATA_BUFFER_MAX];
-	time_t ticks;
-
 	memset(&srvaddr, 0, sizeof(srvaddr));
-	memset(buffer, 0, sizeof(buffer));
 
 	websocket->socket = socket(AF_INET, SOCK_STREAM, 0);
 	if(websocket->socket == -1) {
@@ -54,11 +49,75 @@ int cwebsocket_connect(cwebsocket_server *websocket) {
 		return -1;
 	}
 
+	if(listen(websocket->socket, CWS_MAX_QUEUED_CONNECTIONS) == -1) {
+		syslog(LOG_ERR, "cwebsocket_connect: unable to set maximum queued connections: %s", strerror(errno));
+		return -1;
+	}
+
+	struct ev_io w_accept;
+	struct ev_loop *loop = ev_default_loop(0);
+	ev_io_init(&w_accept, cwebsocket_accept, websocket->socket, EV_READ);
+	ev_io_start(loop, &w_accept);
+
+	while(1) {
+		ev_loop(loop, 0);
+	}
+
 	syslog(LOG_DEBUG, "cwebsocket_connect: connected");
 
 	return 0;
 }
 
+int cwebsocket_accept(struct ev_loop *loop, struct ev_io *watcher, int revents) {
+
+	struct sockaddr_in client_addr;
+	socklen_t client_len = sizeof(client_addr);
+	struct ev_io *w_client = (struct ev_io*) malloc (sizeof(struct ev_io));
+
+	if(EV_ERROR & revents) {
+		syslog(LOG_ERR, "cwebsocket_accept: received invalid event");
+		return -1;
+	}
+
+	int fd = accept(watcher->fd, (struct sockaddr *)&client_addr, &client_len);
+	if(fd == -1) {
+		syslog(LOG_ERR, "cwebsocket_accept: %s", strerror(errno));
+		return -1;
+	}
+
+	syslog(LOG_DEBUG, "cwebsocket_accept: connection accepted");
+
+	ev_io_init(w_client, cwebsocket_read_handshake, fd, EV_READ);
+	ev_io_start(loop, w_client);
+
+	return 0;
+}
+
+int cwebsocket_read_handshake(struct ev_loop *loop, struct ev_io *watcher, int revents){
+
+	char buffer[HANDSHAKE_BUFFER_MAX] = {0};
+
+	if(EV_ERROR & revents) {
+		syslog(LOG_ERR, "cwebsocket_accept: received invalid event");
+		return -1;
+	}
+
+	ssize_t bytes_read = read(watcher->fd, buffer, HANDSHAKE_BUFFER_MAX);
+	if(bytes_read == -1) {
+		perror("read error");
+		return -1;
+	}
+	if(bytes_read == 0) {
+		ev_io_stop(loop, watcher);
+		free(watcher);
+		syslog(LOG_ERR, "cwebsocket_read_handshake: client closed the connection");
+		return -1;
+	}
+
+	syslog(LOG_DEBUG, "cwebsocket_read_handshake: %s", buffer);
+	return 0;
+}
+
 int cwebsocket_close(cwebsocket_server *websocket) {
 	if(websocket->socket > 0) {
 		if(close(websocket->socket) == -1) {