socket work

	modified:   Makefile
	modified:   ie.cpp
	modified:   mISDN.cpp
	modified:   socket_server.c

diff --git a/Makefile b/Makefile
index 89de77c..a93da32 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ INSTALL_BIN = /usr/local/bin
 INSTALL_DATA = /usr/local/lcr
 
 ifdef WITH-SOCKET
-LIBS += -lmISDN -lpthread
+LIBS += -lmisdn -lpthread
 else
 LIBS += -lisdnnet -lmISDN -lpthread
 endif

diff --git a/ie.cpp b/ie.cpp
index 236e49a..a216703 100644 (file)
--- a/ie.cpp
+++ b/ie.cpp
@@ -74,7 +74,8 @@ void Pdss1::dec_ie_complete(unsigned char *p, Q931_info_t *qi, int *complete)
                        *complete = 1;
        } else
 #else
-       unsigned char *p = l3m->sending_complete;
+       // special case: p is not a pointer, it's a value
+       unsigned char p = l3m->sending_complete;
 #endif
        if (p)
                *complete = 1;

diff --git a/mISDN.cpp b/mISDN.cpp
index 2ee2c49..6307840 100644 (file)
--- a/mISDN.cpp
+++ b/mISDN.cpp
@@ -92,7 +92,7 @@ int mISDN_initialize(void)
        mISDNsocket = socket(PF_ISDN, SOCK_RAW, ISDN_P_BASE);
        if (mISDNsocket < 0)
        {
-               fprintf(stderr, "Cannot open mISDN due to %s. (Does your Kernel support socket based mISDN?)\n", strerror(errno));
+               fprintf(stderr, "Cannot open mISDN due to '%s'. (Does your Kernel support socket based mISDN?)\n", strerror(errno));
                return(-1);
        }
 

diff --git a/socket_server.c b/socket_server.c
index 5ad827f..6565602 100644 (file)
--- a/socket_server.c
+++ b/socket_server.c
@@ -283,7 +283,7 @@ int admin_route(struct admin_queue **responsep)
                        end_trace();
                }
 
-               apppbx->e_action_timeout = NULL;
+               apppbx->e_action_timeout = 0;
                apppbx->e_rule = NULL;
                apppbx->e_ruleset = NULL;