changes to allow build on Ubuntu 12.04

diff --git a/lib/abstractroutingengine.h b/lib/abstractroutingengine.h
index f25adb7..b558f40 100644 (file)
--- a/lib/abstractroutingengine.h
+++ b/lib/abstractroutingengine.h
@@ -20,6 +20,9 @@
 #ifndef ABSTRACTROUTINGENGINE_H
 #define ABSTRACTROUTINGENGINE_H
 
+#include "sys/types.h"
+#include <stdlib.h>
+
 #include <boost/any.hpp>
 #include <functional>
 #include <time.h>

diff --git a/plugins/websocketsink/websocketsinkmanager.cpp b/plugins/websocketsink/websocketsinkmanager.cpp
index 002e3ef..d0b27f8 100644 (file)
--- a/plugins/websocketsink/websocketsinkmanager.cpp
+++ b/plugins/websocketsink/websocketsinkmanager.cpp
@@ -78,7 +78,7 @@ void WebSocketSinkManager::setConfiguration(map<string, string> config)
                        port = boost::lexical_cast<int>((*i).second);
                }
        }
-       context = libwebsocket_create_context(port, interface.c_str(), protocollist,libwebsocket_internal_extensions,ssl_cert_path, ssl_key_path, -1, -1, options);
+       context = libwebsocket_create_context(port, interface.c_str(), protocollist, ssl_cert_path, ssl_key_path, -1, -1, options);
 }
 void WebSocketSinkManager::addSingleShotSink(libwebsocket* socket, VehicleProperty::Property property,string id)
 {
@@ -341,12 +341,6 @@ static int websocket_callback(struct libwebsocket_context *context,struct libweb
                        //printf("Client writable\n");
                        break;
                }
-               case LWS_CALLBACK_SERVER_WRITEABLE:
-               {
-                       //printf("Server writable\n");
-                       break;
-               }
-               
                case LWS_CALLBACK_RECEIVE:
                {
                        //printf("Data Received: %s\n",(char*)in);

diff --git a/plugins/websocketsink/websocketsinkmanager.h b/plugins/websocketsink/websocketsinkmanager.h
index f17c326..56a9163 100644 (file)
--- a/plugins/websocketsink/websocketsinkmanager.h
+++ b/plugins/websocketsink/websocketsinkmanager.h
@@ -27,6 +27,8 @@
 #include <libwebsockets.h>
 #include "debugout.h"
 #include <stdexcept>
+#include "sys/types.h"
+#include <stdlib.h>
 
 class WebSocketSinkManager: public AbstractSinkManager
 {

diff --git a/plugins/websocketsourceplugin/websocketsource.cpp b/plugins/websocketsourceplugin/websocketsource.cpp
index aa1bdf2..5830b54 100644 (file)
--- a/plugins/websocketsourceplugin/websocketsource.cpp
+++ b/plugins/websocketsourceplugin/websocketsource.cpp
@@ -285,12 +285,6 @@ static int callback_http_only(libwebsocket_context *context,struct libwebsocket
                        }
                        break;
                }
-               case LWS_CALLBACK_CLIENT_CONFIRM_EXTENSION_SUPPORTED:
-               {
-                       //printf("Requested extension: %s\n",(char*)in);
-                       return 0;
-                       break;
-               }
                case LWS_CALLBACK_ADD_POLL_FD:
                {
                        //Add a FD to the poll list.
@@ -313,7 +307,7 @@ WebSocketSource::WebSocketSource(AbstractRoutingEngine *re, map<string, string>
        clientConnected = false;
        source = this;
        m_re = re;  
-       context = libwebsocket_create_context(CONTEXT_PORT_NO_LISTEN, NULL,protocols, libwebsocket_internal_extensions,NULL, NULL, -1, -1, 0);
+       context = libwebsocket_create_context(CONTEXT_PORT_NO_LISTEN, NULL,protocols, NULL, NULL, -1, -1, 0);
        
        setConfiguration(config);
        re->setSupported(supported(), this);