Ports can now be specified by number or by name.

[lcr.git] / socket_server.c

diff --git a/socket_server.c b/socket_server.c
index e1853d3..4b5a841 100644 (file)
--- a/socket_server.c
+++ b/socket_server.c
@@ -192,7 +192,7 @@ void admin_cleanup(void)
 int admin_interface(struct admin_queue **responsep)
 {
        struct admin_queue      *response;      /* response pointer */
-       char                    *err_txt = "";
+       const char              *err_txt = "";
        int                     err = 0;
 
         if (read_interfaces())
@@ -569,7 +569,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, 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)
 {
        struct admin_list       *admin;
        struct admin_queue      *response, **responsep; /* response pointer */
@@ -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);