[uwebsocketgate]: added devel package

conf/libuniset2.spec

@@ -201,6 +201,13 @@ Summary: Websocket gate for uniset
 
 %description extension-wsgate
 Websocket gate for uniset
+
+%package extension-wsgate-devel
+Group: Development/Tools
+Summary: Websocket gate develop libraries
+
+%description extension-wsgate-devel
+Websocket gate develop libraries
 %endif
 
 %if_enabled mysql
@@ -549,6 +556,12 @@ rm -f %buildroot%_docdir/%oname/html/*.md5
 %if_enabled api
 %files extension-wsgate
 %_bindir/%oname-wsgate*
+%_libdir/libUniSet2UWebSocketGate*.so.*
+
+%files extension-wsgate-devel
+%_pkgconfigdir/libUniSet2UWebSocketGate*.pc
+%_libdir/libUniSet2UWebsocketGate*.so
+%_includedir/%oname/extensions/wsgate/
 %endif
 
 %files extension-common-devel

configure.ac

@@ -595,6 +595,7 @@ AC_CONFIG_FILES([Makefile
 				 extensions/HttpResolver/tests/Makefile
 				 extensions/UWebSocketGate/Makefile
 				 extensions/UWebSocketGate/tests/Makefile
+				 extensions/UWebSocketGate/libUniSet2UWebSocketGate.pc
 				 testsuite/Makefile
 				 wrappers/Makefile
 				 wrappers/python/lib/Makefile

extensions/UWebSocketGate/Makefile.am

 if ENABLE_REST_API
 bin_PROGRAMS = @PACKAGE@-wsgate
+
+WSGATE_VER=@LIBVER@
+
+lib_LTLIBRARIES = libUniSet2UWebSocketGate.la
+libUniSet2UWebSocketGate_la_SOURCES = UWebSocketGate.cc
+libUniSet2UWebSocketGate_la_LDFLAGS = -version-info $(WSGATE_VER)
+libUniSet2UWebSocketGate_la_LIBADD = $(top_builddir)/lib/libUniSet2.la \
+	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
+	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
+	$(SIGC_LIBS) $(POCO_LIBS)
+libUniSet2UWebSocketGate_la_CXXFLAGS = -I$(top_builddir)/extensions/include \
+	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(POCO_CFLAGS)
+
+
+@PACKAGE@_wsgate_SOURCES = main.cc
 @PACKAGE@_wsgate_CXXFLAGS = -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(POCO_CFLAGS)
-@PACKAGE@_wsgate_LDADD = $(top_builddir)/lib/libUniSet2.la \
-    $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-    $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-    $(SIGC_LIBS) $(POCO_LIBS)
-@PACKAGE@_wsgate_SOURCES = UWebSocketGate.cc main.cc
+@PACKAGE@_wsgate_LDADD = libUniSet2UWebSocketGate.la $(top_builddir)/lib/libUniSet2.la \
+	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
+	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
+	$(SIGC_LIBS) $(POCO_LIBS)
+
+
+# install
+devel_include_HEADERS = *.h
+devel_includedir = $(pkgincludedir)/extensions/wsgate
+
+pkgconfigdir   = $(libdir)/pkgconfig
+pkgconfig_DATA = libUniSet2UWebSocketGate.pc
+
 
 include $(top_builddir)/include.mk
 endif

extensions/UWebSocketGate/UWebSocketGate.cc

@@ -805,7 +805,10 @@ void UWebSocketGate::UWebSocket::read( ev::io& io, int revents )
         }
 
         if( (flags & WebSocket::FRAME_OP_BITMASK) & WebSocket::FRAME_OP_PONG )
+        {
+            mylog4 << req->clientAddress().toString() << "(read): pong.." << endl;
             return;
+        }
 
 
         if( (flags & WebSocket::FRAME_OP_BITMASK) == WebSocket::FRAME_OP_CLOSE )
@@ -1126,7 +1129,10 @@ void UWebSocketGate::UWebSocket::write()
     int flags = WebSocket::FRAME_TEXT;
 
     if( msg->len == ping_str.size() )
+    {
         flags = WebSocket::FRAME_FLAG_FIN | WebSocket::FRAME_OP_PING;
+        mylog4 << req->clientAddress().toString() << "(write): ping.." << endl;
+    }
 
     try
     {

extensions/UWebSocketGate/libUniSet2UWebSocketGate.pc.in

+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libUniSet2UWebSocketGate
+Description: Support library for UniSet2UWebSocketGate
+Requires: libUniSet2Extensions
+Version: @VERSION@
+Libs: -L${libdir} -lUniSet2UWebSocketGate
+Cflags: -I${includedir}/@PACKAGE@/extensions/wsgate

extensions/UWebSocketGate/tests/test_uwebsocketgate.cc

@@ -265,7 +265,7 @@ TEST_CASE("[UWebSocketGate]: del", "[uwebsocketgate]")
     ws.receiveFrame(buffer, sizeof(buffer), flags);
 
     string str(buffer);
-    REQUIRE( str.find("Ping") != string::npos );
+    REQUIRE( str == "." );
 }
 // -----------------------------------------------------------------------------
 TEST_CASE("[UWebSocketGate]: get", "[uwebsocketgate]")