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

[lcr.git] / socket_server.c

diff --git a/socket_server.c b/socket_server.c
index 166080d..d4f8ae1 100644 (file)
--- a/socket_server.c
+++ b/socket_server.c
@@ -91,7 +91,7 @@ void free_connection(struct admin_list *admin)
        /* free remote joins */
        if (admin->remote_name[0])
        {
-               start_trace(0,
+               start_trace(-1,
                        NULL,
                        NULL,
                        NULL,
@@ -298,7 +298,7 @@ int admin_route(struct admin_queue **responsep)
                        apppbx->e_callback = 0;
                        apppbx->e_action = NULL;
                        apppbx->release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL);
-                       start_trace(0,
+                       start_trace(-1,
                                NULL,
                                numberrize_callerinfo(apppbx->e_callerinfo.id, apppbx->e_callerinfo.ntype, options.national, options.international),
                                apppbx->e_dialinginfo.id,
@@ -646,7 +646,7 @@ int admin_message_to_join(struct admin_msg *msg, struct admin_list *admin)
                }
                /* set remote socket instance */
                SCPY(admin->remote_name, msg->param.hello.application);
-               start_trace(0,
+               start_trace(-1,
                        NULL,
                        NULL,
                        NULL,
@@ -887,6 +887,8 @@ int admin_state(struct admin_queue **responsep)
                        SCPY(response->am[num].u.i.interface_name, interface->name);
                        /* portnum */
                        response->am[num].u.i.portnum = ifport->portnum;
+                       /* portname */
+                       SCPY(response->am[num].u.i.portname, ifport->portname);
                        /* iftype */
                        response->am[num].u.i.extension = interface->extension;
                        /* block */
@@ -1178,7 +1180,6 @@ int admin_handle(void)
                        {
                                work = 1;
                                brokenpipe:
-                               printf("Broken pipe on socket %d. (errno=%d).\n", admin->sock, errno);
                                PDEBUG(DEBUG_LOG, "Broken pipe on socket %d. (errno=%d).\n", admin->sock, errno);
                                *adminp = admin->next;
                                free_connection(admin);