Merge branch 'master' of ssh://jolly@www.misdn.org/var/git/lcr

[lcr.git] / socket_server.c

diff --git a/socket_server.c b/socket_server.c
index 3083085..47626c4 100644 (file)
--- a/socket_server.c
+++ b/socket_server.c
@@ -13,6 +13,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <curses.h>
+#include "config.h"
 
 
 char socket_name[128];
@@ -530,7 +531,7 @@ int admin_call(struct admin_list *admin, struct admin_message *msg)
        apppbx->e_dialinginfo.sending_complete = 1;
 
        apppbx->new_state(PORT_STATE_OUT_SETUP);
-       apppbx->out_setup();
+       apppbx->out_setup(0);
        return(0);
 }
 
@@ -538,7 +539,7 @@ int admin_call(struct admin_list *admin, struct admin_message *msg)
 /*
  * this function is called for response whenever a call state changes.
  */
-void admin_call_response(int adminid, int message, const char *connected, int cause, int location, int notify)
+void admin_call_response(int adminid, int message, const char *connected, int cause, int location, int notify_progress)
 {
        struct admin_list       *admin;
        struct admin_queue      *response, **responsep; /* response pointer */
@@ -573,7 +574,7 @@ void admin_call_response(int adminid, int message, const char *connected, int ca
        SCPY(response->am[0].u.call.callerid, connected);
        response->am[0].u.call.cause = cause;
        response->am[0].u.call.location = location;
-       response->am[0].u.call.notify = notify;
+       response->am[0].u.call.notify_progress = notify_progress;
 
        /* attach to response chain */
        *responsep = response;
@@ -1049,7 +1050,7 @@ int admin_state(struct admin_queue **responsep)
                        response->am[num].u.p.state = ADMIN_STATE_IDLE;
                }
                /* isdn */
-               if ((port->p_type&PORT_CLASS_mISDN_MASK) == PORT_CLASS_mISDN_DSS1) {
+               if ((port->p_type & PORT_CLASS_mISDN_MASK) == PORT_CLASS_DSS1) {
                        response->am[num].u.p.isdn = 1;
                        pdss1 = (class Pdss1 *)port;
                        response->am[num].u.p.isdn_chan = pdss1->p_m_b_channel;