#include <curses.h>
-char *socket_name = SOCKET_NAME;
+char socket_name[128];
int sock = -1;
struct sockaddr_un sock_address;
*/
int admin_init(void)
{
- unsigned long on = 1;
+ unsigned int on = 1;
/* open and bind socket */
if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
}
fhuse++;
memset(&sock_address, 0, sizeof(sock_address));
+ SPRINT(socket_name, SOCKET_NAME, options.lock);
sock_address.sun_family = AF_UNIX;
UCPY(sock_address.sun_path, socket_name);
unlink(socket_name);
PERROR("Failed to set socket \"%s\" into non-blocking mode. (errno=%d)\n", sock_address.sun_path, errno);
return(-1);
}
+ if (chmod(socket_name, options.socketrights) < 0)
+ {
+ PERROR("Failed to change socket rigts to %d. (errno=%d)\n", options.socketrights, errno);
+ }
return(0);
}
close(sock);
fhuse--;
}
+
+ unlink(socket_name);
}
*/
int admin_release(struct admin_queue **responsep, char *message)
{
- unsigned long id;
+ unsigned int id;
struct admin_queue *response; /* response pointer */
class EndpointAppPBX *apppbx;
}
if (!join)
{
- PERROR("No join found with serial %d.\n", msg->ref);
- return(-1);
+ PDEBUG(DEBUG_LOG, "No join found with serial %d. (May have been already released.)\n", msg->ref);
+ return(0);
}
/* check application */
/*
* this function is called for every message to remote socket
*/
-int admin_message_from_join(int remote_id, unsigned long ref, int message_type, union parameter *param)
+int admin_message_from_join(int remote_id, unsigned int ref, int message_type, union parameter *param)
{
struct admin_list *admin;
struct admin_queue **responsep; /* response pointer */
response->am[num].u.i.busy[i] = mISDNport->b_state[i];
if (mISDNport->b_port[i])
response->am[num].u.i.port[i] = mISDNport->b_port[i]->p_serial;
+ response->am[num].u.i.mode[i] = mISDNport->b_mode[i];
i++;
}
}
int len;
int new_sock;
socklen_t sock_len = sizeof(sock_address);
- unsigned long on = 1;
+ unsigned int on = 1;
int work = 0; /* if work was done */
struct Endpoint *epoint;