Index: chan_mgcp.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_mgcp.c,v retrieving revision 1.101 diff -u -r1.101 chan_mgcp.c --- chan_mgcp.c 1 Jan 2005 00:59:54 -0000 1.101 +++ chan_mgcp.c 5 Jan 2005 10:14:21 -0000 @@ -3,7 +3,7 @@ * * Implementation of Media Gateway Control Protocol * - * Copyright (C) 1999-2004, Digium, Inc. + * Copyright (C) 1999-2005, Digium, Inc. * * Mark Spencer * @@ -44,9 +44,10 @@ -- enhance retransmit mechanism (RTO calc. etc.) -- embedded command support */ + /* FS: Changes - * -- fixed reload_config() / do_monitor to stay responsive during reloads - */ + -- fixed reload_config() / do_monitor to stay responsive during reloads +*/ #include #include @@ -98,11 +99,11 @@ * Define to work around buggy dlink MGCP phone firmware which * appears not to know that "rt" is part of the "G" package. */ -/* #define DLINK_BUGGY_FIRMWARE */ +/* #define DLINK_BUGGY_FIRMWARE */ #define MGCPDUMPER -#define DEFAULT_EXPIREY 120 -#define MAX_EXPIREY 3600 +#define DEFAULT_EXPIRY 120 +#define MAX_EXPIRY 3600 #define CANREINVITE 1 #ifndef INADDR_NONE @@ -115,29 +116,29 @@ static char *config = "mgcp.conf"; #define MGCP_DTMF_RFC2833 (1 << 0) -#define MGCP_DTMF_INBAND (1 << 1) +#define MGCP_DTMF_INBAND (1 << 1) -#define DEFAULT_MGCP_GW_PORT 2427/* From RFC 2705 */ -#define DEFAULT_MGCP_CA_PORT 2727/* From RFC 2705 */ -#define MGCP_MAX_PACKET 1500 /* Also from RFC 2543, should sub headers tho */ -#define DEFAULT_RETRANS 1000 /* How frequently to retransmit */ -#define MAX_RETRANS 5 /* Try only 5 times for retransmissions */ +#define DEFAULT_MGCP_GW_PORT 2427 /* From RFC 2705 */ +#define DEFAULT_MGCP_CA_PORT 2727 /* From RFC 2705 */ +#define MGCP_MAX_PACKET 1500 /* Also from RFC 2543, should sub headers tho */ +#define DEFAULT_RETRANS 1000 /* How frequently to retransmit */ +#define MAX_RETRANS 5 /* Try only 5 times for retransmissions */ /* MGCP rtp stream modes */ -#define MGCP_CX_SENDONLY 0 -#define MGCP_CX_RECVONLY 1 -#define MGCP_CX_SENDRECV 2 -#define MGCP_CX_CONF 3 -#define MGCP_CX_CONFERENCE 3 -#define MGCP_CX_MUTE 4 -#define MGCP_CX_INACTIVE 4 +#define MGCP_CX_SENDONLY 0 +#define MGCP_CX_RECVONLY 1 +#define MGCP_CX_SENDRECV 2 +#define MGCP_CX_CONF 3 +#define MGCP_CX_CONFERENCE 3 +#define MGCP_CX_MUTE 4 +#define MGCP_CX_INACTIVE 4 static char *mgcp_cxmodes[] = { - "sendonly", - "recvonly", - "sendrecv", - "confrnce", - "inactive" + "sendonly", + "recvonly", + "sendrecv", + "confrnce", + "inactive" }; /* SC: MGCP commands */ @@ -163,7 +164,7 @@ /* Not used. Dosn't hurt for us to always send cid */ /* to the mgcp box. */ -/* static int use_callerid = 1;*/ +/*static int use_callerid = 1;*/ /*static int cur_signalling = -1;*/ /*static unsigned int cur_group = 0;*/ @@ -173,7 +174,7 @@ /* XXX Is this needed? */ /* Doesn't look like the dsp stuff for */ /* dtmfmode is actually hooked up. */ -/* static int relaxdtmf = 0; */ +/*static int relaxdtmf = 0;*/ static int tos = 0; @@ -214,7 +215,6 @@ static int adsi = 0; - static int usecnt =0; AST_MUTEX_DEFINE_STATIC(usecnt_lock); /* SC: transaction id should always be positive */ @@ -236,7 +236,7 @@ AST_MUTEX_DEFINE_STATIC(monlock); /* This is the thread for the monitor which checks for input on the channels - which are not currently in use. */ + which are not currently in use. */ static pthread_t monitor_thread = AST_PTHREADT_NULL; static int restart_monitor(void); @@ -256,8 +256,8 @@ /* The private structures of the mgcp channels are linked for selecting outgoing channels */ -#define MGCP_MAX_HEADERS 64 -#define MGCP_MAX_LINES 64 +#define MGCP_MAX_HEADERS 64 +#define MGCP_MAX_LINES 64 struct mgcp_request { int len; @@ -265,14 +265,14 @@ char *identifier; char *endpoint; char *version; - int headers; /* MGCP Headers */ + int headers; /* MGCP Headers */ char *header[MGCP_MAX_HEADERS]; - int lines; /* SDP Content */ + int lines; /* SDP Content */ char *line[MGCP_MAX_LINES]; char data[MGCP_MAX_PACKET]; - int cmd; /* SC: int version of verb = command */ - unsigned int trid; /* SC: int version of identifier = transaction id */ - struct mgcp_request *next; /* SC: next in the queue */ + int cmd; /* SC: int version of verb = command */ + unsigned int trid; /* SC: int version of identifier = transaction id */ + struct mgcp_request *next; /* SC: next in the queue */ }; /* SC: obsolete @@ -287,10 +287,10 @@ /* MGCP message for queuing up */ struct mgcp_message { - struct mgcp_endpoint *owner_ep; - struct mgcp_subchannel *owner_sub; - int retrans; - unsigned long expire; + struct mgcp_endpoint *owner_ep; + struct mgcp_subchannel *owner_sub; + int retrans; + unsigned long expire; unsigned int seqno; int len; struct mgcp_message *next; @@ -313,29 +313,29 @@ #define SUB_ALT 1 struct mgcp_subchannel { - /* SC: subchannel magic string. - Needed to prove that any subchannel pointer passed by asterisk - really points to a valid subchannel memory area. - Ugly.. But serves the purpose for the time being. - */ + /* SC: subchannel magic string. + Needed to prove that any subchannel pointer passed by asterisk + really points to a valid subchannel memory area. + Ugly.. But serves the purpose for the time being. + */ #define MGCP_SUBCHANNEL_MAGIC "!978!" - char magic[6]; + char magic[6]; ast_mutex_t lock; - int id; - struct ast_channel *owner; - struct mgcp_endpoint *parent; - struct ast_rtp *rtp; + int id; + struct ast_channel *owner; + struct mgcp_endpoint *parent; + struct ast_rtp *rtp; struct sockaddr_in tmpdest; - char txident[80]; /* FIXME SC: txident is replaced by rqnt_ident in endpoint. - This should be obsoleted */ - char cxident[80]; - char callid[80]; + char txident[80]; /* FIXME SC: txident is replaced by rqnt_ident in endpoint. + This should be obsoleted */ + char cxident[80]; + char callid[80]; /* SC: obsolete - time_t lastouttime; - int lastout; + time_t lastouttime; + int lastout; */ - int cxmode; - struct mgcp_request *cx_queue; /* SC: pending CX commands */ + int cxmode; + struct mgcp_request *cx_queue; /* SC: pending CX commands */ ast_mutex_t cx_queue_lock; /* SC: CX queue lock */ int nat; int iseq; /* Not used? RTP? */ @@ -345,19 +345,19 @@ int messagepending; struct mgcp_message *msgs; */ - struct mgcp_subchannel *next; /* for out circular linked list */ + struct mgcp_subchannel *next; /* for out circular linked list */ }; -#define MGCP_ONHOOK 1 +#define MGCP_ONHOOK 1 #define MGCP_OFFHOOK 2 -#define TYPE_TRUNK 1 -#define TYPE_LINE 2 +#define TYPE_TRUNK 1 +#define TYPE_LINE 2 struct mgcp_endpoint { ast_mutex_t lock; char name[80]; - struct mgcp_subchannel *sub; /* pointer to our current connection, channel and stuff */ + struct mgcp_subchannel *sub; /* pointer to our current connection, channel and stuff */ char accountcode[80]; char exten[AST_MAX_EXTENSION]; /* Extention where to start */ char context[AST_MAX_EXTENSION]; @@ -366,49 +366,49 @@ char cid_name[AST_MAX_EXTENSION]; /* Caller*ID */ char lastcallerid[AST_MAX_EXTENSION]; /* Last Caller*ID */ char call_forward[AST_MAX_EXTENSION]; /* Last Caller*ID */ - char mailbox[AST_MAX_EXTENSION]; - char musicclass[MAX_LANGUAGE]; - char curtone[80]; /* Current tone */ - unsigned int callgroup; - unsigned int pickupgroup; + char mailbox[AST_MAX_EXTENSION]; + char musicclass[MAX_LANGUAGE]; + char curtone[80]; /* Current tone */ + unsigned int callgroup; + unsigned int pickupgroup; int callwaiting; - int transfer; - int threewaycalling; + int transfer; + int threewaycalling; int singlepath; int cancallforward; int canreinvite; int callreturn; - int dnd; /* How does this affect callwait? Do we just deny a mgcp_request if we're dnd? */ + int dnd; /* How does this affect callwait? Do we just deny a mgcp_request if we're dnd? */ int hascallerid; int hidecallerid; int dtmfmode; int amaflags; int type; - int slowsequence; /* MS: Sequence the endpoint as a whole */ + int slowsequence; /* MS: Sequence the endpoint as a whole */ int group; int iseq; /* Not used? */ int lastout; /* tracking this on the subchannels. Is it needed here? */ int needdestroy; /* Not used? */ int capability; int nonCodecCapability; - int onhooktime; - int msgstate; /* voicemail message state */ - int immediate; - int hookstate; - int adsi; + int onhooktime; + int msgstate; /* voicemail message state */ + int immediate; + int hookstate; + int adsi; char rqnt_ident[80]; /* SC: request identifier */ - struct mgcp_request *rqnt_queue; /* SC: pending RQNT commands */ + struct mgcp_request *rqnt_queue; /* SC: pending RQNT commands */ ast_mutex_t rqnt_queue_lock; - struct mgcp_request *cmd_queue; /* SC: pending commands other than RQNT */ + struct mgcp_request *cmd_queue; /* SC: pending commands other than RQNT */ ast_mutex_t cmd_queue_lock; - int delme; /* SC: needed for reload */ - int needaudit; /* SC: needed for reload */ + int delme; /* SC: needed for reload */ + int needaudit; /* SC: needed for reload */ struct ast_dsp *dsp; /* XXX Should there be a dsp/subchannel? XXX */ - /* owner is tracked on the subchannels, and the *sub indicates whos in charge */ + /* owner is tracked on the subchannels, and the *sub indicates whos in charge */ /* struct ast_channel *owner; */ /* struct ast_rtp *rtp; */ /* struct sockaddr_in tmpdest; */ - /* message go the the endpoint and not the channel so they stay here */ + /* message go the the endpoint and not the channel so they stay here */ struct mgcp_endpoint *next; struct mgcp_gateway *parent; }; @@ -416,7 +416,7 @@ static struct mgcp_gateway { /* A gateway containing one or more endpoints */ char name[80]; - int isnamedottedip; /* SC: is the name FQDN or dotted ip */ + int isnamedottedip; /* SC: is the name FQDN or dotted ip */ struct sockaddr_in addr; struct sockaddr_in defaddr; struct in_addr ourip; @@ -425,16 +425,16 @@ struct mgcp_endpoint *endpoints; struct ast_ha *ha; /* SC: obsolete - time_t lastouttime; - int lastout; + time_t lastouttime; + int lastout; int messagepending; */ /* JS: Wildcard endpoint name */ char wcardep[30]; struct mgcp_message *msgs; /* SC: gw msg queue */ ast_mutex_t msgs_lock; /* SC: queue lock */ - int retransid; /* SC: retrans timer id */ - int delme; /* SC: needed for reload */ + int retransid; /* SC: retrans timer id */ + int delme; /* SC: needed for reload */ struct mgcp_response *responses; struct mgcp_gateway *next; } *gateways; @@ -470,7 +470,7 @@ static int unalloc_sub(struct mgcp_subchannel *sub) { - struct mgcp_endpoint *p = sub->parent; + struct mgcp_endpoint *p = sub->parent; if (p->sub == sub) { ast_log(LOG_WARNING, "Trying to unalloc the real channel %s@%s?!?\n", p->name, p->parent->name); return -1; @@ -480,10 +480,10 @@ sub->owner = NULL; if (strlen(sub->cxident)) { transmit_connection_del(sub); - } - sub->cxident[0] = '\0'; - sub->callid[0] = '\0'; - sub->cxmode = MGCP_CX_INACTIVE; + } + sub->cxident[0] = '\0'; + sub->callid[0] = '\0'; + sub->cxmode = MGCP_CX_INACTIVE; sub->outgoing = 0; sub->alreadygone = 0; memset(&sub->tmpdest, 0, sizeof(sub->tmpdest)); @@ -491,7 +491,7 @@ ast_rtp_destroy(sub->rtp); sub->rtp = NULL; } - dump_cmd_queues(NULL, sub); /* SC */ + dump_cmd_queues(NULL, sub); /* SC */ return 0; } @@ -500,9 +500,9 @@ { int res; if (gw->addr.sin_addr.s_addr) - res=sendto(mgcpsock, data, len, 0, (struct sockaddr *)&gw->addr, sizeof(struct sockaddr_in)); + res=sendto(mgcpsock, data, len, 0, (struct sockaddr *)&gw->addr, sizeof(struct sockaddr_in)); else - res=sendto(mgcpsock, data, len, 0, (struct sockaddr *)&gw->defaddr, sizeof(struct sockaddr_in)); + res=sendto(mgcpsock, data, len, 0, (struct sockaddr *)&gw->defaddr, sizeof(struct sockaddr_in)); if (res != len) { ast_log(LOG_WARNING, "mgcp_xmit returned %d: %s\n", res, strerror(errno)); } @@ -511,12 +511,12 @@ static int resend_response(struct mgcp_subchannel *sub, struct mgcp_response *resp) { - struct mgcp_endpoint *p = sub->parent; + struct mgcp_endpoint *p = sub->parent; int res; char iabuf[INET_ADDRSTRLEN]; if (mgcpdebug) { ast_verbose("Retransmitting:\n%s\n to %s:%d\n", resp->buf, ast_inet_ntoa(iabuf, sizeof(iabuf), p->parent->addr.sin_addr), ntohs(p->parent->addr.sin_port)); - } + } res = __mgcp_xmit(p->parent, resp->buf, resp->len); if (res > 0) res = 0; @@ -525,12 +525,12 @@ static int send_response(struct mgcp_subchannel *sub, struct mgcp_request *req) { - struct mgcp_endpoint *p = sub->parent; + struct mgcp_endpoint *p = sub->parent; int res; char iabuf[INET_ADDRSTRLEN]; if (mgcpdebug) { ast_verbose("Transmitting:\n%s\n to %s:%d\n", req->data, ast_inet_ntoa(iabuf, sizeof(iabuf), p->parent->addr.sin_addr), ntohs(p->parent->addr.sin_port)); - } + } res = __mgcp_xmit(p->parent, req->data, req->len); if (res > 0) res = 0; @@ -542,39 +542,37 @@ { struct mgcp_message *cur, *q = NULL, *w, *prev; - ast_mutex_lock(&gw->msgs_lock); - prev = NULL, cur = gw->msgs; - while (cur) { - if (!p || cur->owner_ep == p) { - if (prev) - prev->next = cur->next; - else - gw->msgs = cur->next; - - ast_log(LOG_NOTICE, "Removing message from %s transaction %u\n", - gw->name, cur->seqno); - - w = cur; - cur = cur->next; - if (q) { - w->next = q; - } - else { - w->next = NULL; - } - q = w; - } - else { - prev = cur, cur=cur->next; - } - } - ast_mutex_unlock(&gw->msgs_lock); - - while (q) { - cur = q; - q = q->next; - free(cur); - } + ast_mutex_lock(&gw->msgs_lock); + prev = NULL, cur = gw->msgs; + while (cur) { + if (!p || cur->owner_ep == p) { + if (prev) + prev->next = cur->next; + else + gw->msgs = cur->next; + + ast_log(LOG_NOTICE, "Removing message from %s transaction %u\n", + gw->name, cur->seqno); + + w = cur; + cur = cur->next; + if (q) { + w->next = q; + } else { + w->next = NULL; + } + q = w; + } else { + prev = cur, cur=cur->next; + } + } + ast_mutex_unlock(&gw->msgs_lock); + + while (q) { + cur = q; + q = q->next; + free(cur); + } } static void mgcp_queue_frame(struct mgcp_subchannel *sub, struct ast_frame *f) @@ -622,74 +620,73 @@ static int retrans_pkt(void *data) { - struct mgcp_gateway *gw = (struct mgcp_gateway *)data; + struct mgcp_gateway *gw = (struct mgcp_gateway *)data; struct mgcp_message *cur, *exq = NULL, *w, *prev; struct timeval tv; - unsigned long t; - int res = 0; + unsigned long t; + int res = 0; if (gettimeofday(&tv, NULL) < 0) { /* This shouldn't ever happen, but let's be sure */ ast_log(LOG_NOTICE, "gettimeofday() failed!\n"); - return 0; + return 0; } - t = tv.tv_sec * 1000 + tv.tv_usec / 1000; + t = tv.tv_sec * 1000 + tv.tv_usec / 1000; + + /* find out expired msgs */ + ast_mutex_lock(&gw->msgs_lock); + + prev = NULL, cur = gw->msgs; + while (cur) { + if (cur->retrans < MAX_RETRANS) { + cur->retrans++; + if (mgcpdebug) { + ast_verbose("Retransmitting #%d transaction %u on [%s]\n", + cur->retrans, cur->seqno, gw->name); + } + __mgcp_xmit(gw, cur->buf, cur->len); + + prev = cur; + cur = cur->next; + } else { + if (prev) + prev->next = cur->next; + else + gw->msgs = cur->next; + + ast_log(LOG_WARNING, "Maximum retries exceeded for transaction %u on [%s]\n", + cur->seqno, gw->name); + + w = cur; + cur = cur->next; + + if (exq) { + w->next = exq; + } else { + w->next = NULL; + } + exq = w; + } + } - /* find out expired msgs */ - ast_mutex_lock(&gw->msgs_lock); + if (!gw->msgs) { + gw->retransid = -1; + res = 0; + } else { + res = 1; + } + ast_mutex_unlock(&gw->msgs_lock); - prev = NULL, cur = gw->msgs; - while (cur) { - if (cur->retrans < MAX_RETRANS) { - cur->retrans++; - if (mgcpdebug) { - ast_verbose("Retransmitting #%d transaction %u on [%s]\n", cur->retrans, cur->seqno, gw->name); - } - __mgcp_xmit(gw, cur->buf, cur->len); - - prev = cur; - cur = cur->next; - } - else { - if (prev) - prev->next = cur->next; - else - gw->msgs = cur->next; - - ast_log(LOG_WARNING, "Maximum retries exceeded for transaction %u on [%s]\n", cur->seqno, gw->name); - - w = cur; - cur = cur->next; - - if (exq) { - w->next = exq; - } - else { - w->next = NULL; - } - exq = w; - } - } - - if (!gw->msgs) { - gw->retransid = -1; - res = 0; - } - else { - res = 1; - } - ast_mutex_unlock(&gw->msgs_lock); - - while (exq) { - cur = exq; - /* time-out transaction */ - handle_response(cur->owner_ep, cur->owner_sub, 406, cur->seqno, NULL); - exq = exq->next; - free(cur); - } + while (exq) { + cur = exq; + /* time-out transaction */ + handle_response(cur->owner_ep, cur->owner_sub, 406, cur->seqno, NULL); + exq = exq->next; + free(cur); + } - return res; + return res; } /* SC: modified for the new transaction mechanism */ @@ -703,17 +700,17 @@ if (!msg) { return -1; - } - if (!gw) { - return -1; - } + } + if (!gw) { + return -1; + } /* SC - time(&t); - if (gw->messagepending && (gw->lastouttime + 20 < t)) { - ast_log(LOG_NOTICE, "Timeout waiting for response to message:%d, lastouttime: %ld, now: %ld. Dumping pending queue\n", - gw->msgs ? gw->msgs->seqno : -1, (long) gw->lastouttime, (long) t); - dump_queue(sub->parent); - } + time(&t); + if (gw->messagepending && (gw->lastouttime + 20 < t)) { + ast_log(LOG_NOTICE, "Timeout waiting for response to message:%d, lastouttime: %ld, now: %ld. Dumping pending queue\n", + gw->msgs ? gw->msgs->seqno : -1, (long) gw->lastouttime, (long) t); + dump_queue(sub->parent); + } */ msg->owner_sub = sub; msg->owner_ep = p; @@ -723,7 +720,7 @@ msg->retrans = 0; memcpy(msg->buf, data, msg->len); - ast_mutex_lock(&gw->msgs_lock); + ast_mutex_lock(&gw->msgs_lock); cur = gw->msgs; if (cur) { while(cur->next) @@ -731,26 +728,25 @@ cur->next = msg; } else { gw->msgs = msg; - } + } if (gettimeofday(&tv, NULL) < 0) { /* This shouldn't ever happen, but let's be sure */ ast_log(LOG_NOTICE, "gettimeofday() failed!\n"); - } - else { - msg->expire = tv.tv_sec * 1000 + tv.tv_usec / 1000 + DEFAULT_RETRANS; + } else { + msg->expire = tv.tv_sec * 1000 + tv.tv_usec / 1000 + DEFAULT_RETRANS; - if (gw->retransid == -1) - gw->retransid = ast_sched_add(sched, DEFAULT_RETRANS, retrans_pkt, (void *)gw); - } - ast_mutex_unlock(&gw->msgs_lock); + if (gw->retransid == -1) + gw->retransid = ast_sched_add(sched, DEFAULT_RETRANS, retrans_pkt, (void *)gw); + } + ast_mutex_unlock(&gw->msgs_lock); /* SC if (!gw->messagepending) { gw->messagepending = 1; gw->lastout = seqno; - gw->lastouttime = t; + gw->lastouttime = t; */ - __mgcp_xmit(gw, msg->buf, msg->len); + __mgcp_xmit(gw, msg->buf, msg->len); /* XXX Should schedule retransmission XXX */ /* SC } else @@ -763,111 +759,111 @@ static int send_request(struct mgcp_endpoint *p, struct mgcp_subchannel *sub, struct mgcp_request *req, unsigned int seqno) { - int res = 0; - struct mgcp_request **queue, *q, *r, *t; + int res = 0; + struct mgcp_request **queue, *q, *r, *t; char iabuf[INET_ADDRSTRLEN]; - ast_mutex_t *l; + ast_mutex_t *l; ast_log(LOG_DEBUG, "Slow sequence is %d\n", p->slowsequence); if (p->slowsequence) { queue = &p->cmd_queue; l = &p->cmd_queue_lock; ast_mutex_lock(l); - } else - switch (req->cmd) { - case MGCP_CMD_DLCX: - queue = &sub->cx_queue; - l = &sub->cx_queue_lock; - ast_mutex_lock(l); - q = sub->cx_queue; - /* delete pending cx cmds */ - while (q) { - r = q->next; - free(q); - q = r; - } - *queue = NULL; - break; - - case MGCP_CMD_CRCX: - case MGCP_CMD_MDCX: - queue = &sub->cx_queue; - l = &sub->cx_queue_lock; - ast_mutex_lock(l); - break; - - case MGCP_CMD_RQNT: - queue = &p->rqnt_queue; - l = &p->rqnt_queue_lock; - ast_mutex_lock(l); - break; - - default: - queue = &p->cmd_queue; - l = &p->cmd_queue_lock; - ast_mutex_lock(l); - break; - } - - r = (struct mgcp_request *) malloc (sizeof(struct mgcp_request)); - if (!r) { - ast_log(LOG_WARNING, "Cannot post MGCP request: insufficient memory\n"); - ast_mutex_unlock(l); - return -1; - } - memcpy(r, req, sizeof(struct mgcp_request)); - - if (!(*queue)) { - if (mgcpdebug) { - ast_verbose("Posting Request:\n%s to %s:%d\n", req->data, - ast_inet_ntoa(iabuf, sizeof(iabuf), p->parent->addr.sin_addr), ntohs(p->parent->addr.sin_port)); - } - - res = mgcp_postrequest(p, sub, req->data, req->len, seqno); - } - else { - if (mgcpdebug) { - ast_verbose("Queueing Request:\n%s to %s:%d\n", req->data, - ast_inet_ntoa(iabuf, sizeof(iabuf), p->parent->addr.sin_addr), ntohs(p->parent->addr.sin_port)); - } - } - - /* XXX SC: find tail. We could also keep tail in the data struct for faster access */ - for (t = *queue; t && t->next; t = t->next); - - r->next = NULL; - if (t) - t->next = r; - else - *queue = r; + } else { + switch (req->cmd) { + case MGCP_CMD_DLCX: + queue = &sub->cx_queue; + l = &sub->cx_queue_lock; + ast_mutex_lock(l); + q = sub->cx_queue; + /* delete pending cx cmds */ + while (q) { + r = q->next; + free(q); + q = r; + } + *queue = NULL; + break; + + case MGCP_CMD_CRCX: + case MGCP_CMD_MDCX: + queue = &sub->cx_queue; + l = &sub->cx_queue_lock; + ast_mutex_lock(l); + break; + + case MGCP_CMD_RQNT: + queue = &p->rqnt_queue; + l = &p->rqnt_queue_lock; + ast_mutex_lock(l); + break; + + default: + queue = &p->cmd_queue; + l = &p->cmd_queue_lock; + ast_mutex_lock(l); + break; + } + } + + r = (struct mgcp_request *) malloc (sizeof(struct mgcp_request)); + if (!r) { + ast_log(LOG_WARNING, "Cannot post MGCP request: insufficient memory\n"); + ast_mutex_unlock(l); + return -1; + } + memcpy(r, req, sizeof(struct mgcp_request)); + + if (!(*queue)) { + if (mgcpdebug) { + ast_verbose("Posting Request:\n%s to %s:%d\n", req->data, + ast_inet_ntoa(iabuf, sizeof(iabuf), p->parent->addr.sin_addr), ntohs(p->parent->addr.sin_port)); + } + + res = mgcp_postrequest(p, sub, req->data, req->len, seqno); + } else { + if (mgcpdebug) { + ast_verbose("Queueing Request:\n%s to %s:%d\n", req->data, + ast_inet_ntoa(iabuf, sizeof(iabuf), p->parent->addr.sin_addr), ntohs(p->parent->addr.sin_port)); + } + } + + /* XXX SC: find tail. We could also keep tail in the data struct for faster access */ + for (t = *queue; t && t->next; t = t->next); + + r->next = NULL; + if (t) + t->next = r; + else + *queue = r; - ast_mutex_unlock(l); + ast_mutex_unlock(l); - return res; + return res; } static int mgcp_call(struct ast_channel *ast, char *dest, int timeout) { int res; struct mgcp_endpoint *p; - struct mgcp_subchannel *sub; - char *tone; + struct mgcp_subchannel *sub; + char *tone; - if (mgcpdebug) { - ast_verbose(VERBOSE_PREFIX_3 "MGCP mgcp_call(%s)\n", ast->name); - } + if (mgcpdebug) { + ast_verbose(VERBOSE_PREFIX_3 "MGCP mgcp_call(%s)\n", ast->name); + } sub = ast->pvt->pvt; - p = sub->parent; + p = sub->parent; ast_mutex_lock(&sub->lock); - switch (p->hookstate) { - case MGCP_OFFHOOK: - tone = "L/wt"; - break; - case MGCP_ONHOOK: - default: - tone = "L/rg"; - break; - } + switch (p->hookstate) { + case MGCP_OFFHOOK: + tone = "L/wt"; + break; + case MGCP_ONHOOK: + default: + tone = "L/rg"; + break; + } if ((ast->_state != AST_STATE_DOWN) && (ast->_state != AST_STATE_RESERVED)) { ast_log(LOG_WARNING, "mgcp_call called on %s, neither down nor reserved\n", ast->name); @@ -877,29 +873,28 @@ res = 0; sub->outgoing = 1; - sub->cxmode = MGCP_CX_RECVONLY; + sub->cxmode = MGCP_CX_RECVONLY; if (p->type == TYPE_LINE) { - if (!sub->rtp) { - start_rtp(sub); - } else { - transmit_modify_request(sub); - } - - if (sub->next->owner && strlen(sub->next->cxident) && strlen(sub->next->callid)) { - /* try to prevent a callwait from disturbing the other connection */ - sub->next->cxmode = MGCP_CX_RECVONLY; - transmit_modify_request(sub->next); - } + if (!sub->rtp) { + start_rtp(sub); + } else { + transmit_modify_request(sub); + } + + if (sub->next->owner && strlen(sub->next->cxident) && strlen(sub->next->callid)) { + /* try to prevent a callwait from disturbing the other connection */ + sub->next->cxmode = MGCP_CX_RECVONLY; + transmit_modify_request(sub->next); + } transmit_notify_request_with_callerid(sub, tone, ast->cid.cid_num, ast->cid.cid_name); ast_setstate(ast, AST_STATE_RINGING); - if (sub->next->owner && strlen(sub->next->cxident) && strlen(sub->next->callid)) { - /* Put the connection back in sendrecv */ - sub->next->cxmode = MGCP_CX_SENDRECV; - transmit_modify_request(sub->next); - } - + if (sub->next->owner && strlen(sub->next->cxident) && strlen(sub->next->callid)) { + /* Put the connection back in sendrecv */ + sub->next->cxmode = MGCP_CX_SENDRECV; + transmit_modify_request(sub->next); + } } else { ast_log(LOG_NOTICE, "Don't know how to dial on trunks yet\n"); res = -1; @@ -931,14 +926,14 @@ } if ((p->dtmfmode & MGCP_DTMF_INBAND) && p->dsp) { - /* SC: check whether other channel is active. */ - if (!sub->next->owner) { - if (mgcpdebug) { - ast_verbose(VERBOSE_PREFIX_2 "MGCP free dsp on %s@%s\n", p->name, p->parent->name); - } - ast_dsp_free(p->dsp); - p->dsp = NULL; - } + /* SC: check whether other channel is active. */ + if (!sub->next->owner) { + if (mgcpdebug) { + ast_verbose(VERBOSE_PREFIX_2 "MGCP free dsp on %s@%s\n", p->name, p->parent->name); + } + ast_dsp_free(p->dsp); + p->dsp = NULL; + } } sub->owner = NULL; @@ -946,28 +941,28 @@ transmit_connection_del(sub); } sub->cxident[0] = '\0'; - if ((sub == p->sub) && sub->next->owner) { - if (p->hookstate == MGCP_OFFHOOK) { - if (sub->next->owner && ast_bridged_channel(sub->next->owner)) { - transmit_notify_request_with_callerid(p->sub, "L/wt", ast_bridged_channel(sub->next->owner)->cid.cid_num, ast_bridged_channel(sub->next->owner)->cid.cid_name); - } - } else { - /* set our other connection as the primary and swith over to it */ - p->sub = sub->next; - p->sub->cxmode = MGCP_CX_RECVONLY; - transmit_modify_request(p->sub); - if (sub->next->owner && ast_bridged_channel(sub->next->owner)) { - transmit_notify_request_with_callerid(p->sub, "L/rg", ast_bridged_channel(sub->next->owner)->cid.cid_num, ast_bridged_channel(sub->next->owner)->cid.cid_name); - } - } - - } else if ((sub == p->sub->next) && p->hookstate == MGCP_OFFHOOK) { - transmit_notify_request(sub, "L/v"); - } else if (p->hookstate == MGCP_OFFHOOK) { - transmit_notify_request(sub, "L/ro"); - } else { - transmit_notify_request(sub, ""); - } + if ((sub == p->sub) && sub->next->owner) { + if (p->hookstate == MGCP_OFFHOOK) { + if (sub->next->owner && ast_bridged_channel(sub->next->owner)) { + transmit_notify_request_with_callerid(p->sub, "L/wt", ast_bridged_channel(sub->next->owner)->cid.cid_num, ast_bridged_channel(sub->next->owner)->cid.cid_name); + } + } else { + /* set our other connection as the primary and swith over to it */ + p->sub = sub->next; + p->sub->cxmode = MGCP_CX_RECVONLY; + transmit_modify_request(p->sub); + if (sub->next->owner && ast_bridged_channel(sub->next->owner)) { + transmit_notify_request_with_callerid(p->sub, "L/rg", ast_bridged_channel(sub->next->owner)->cid.cid_num, ast_bridged_channel(sub->next->owner)->cid.cid_name); + } + } + + } else if ((sub == p->sub->next) && p->hookstate == MGCP_OFFHOOK) { + transmit_notify_request(sub, "L/v"); + } else if (p->hookstate == MGCP_OFFHOOK) { + transmit_notify_request(sub, "L/ro"); + } else { + transmit_notify_request(sub, ""); + } ast->pvt->pvt = NULL; sub->alreadygone = 0; @@ -982,25 +977,27 @@ } /* SC: Decrement use count */ - ast_mutex_lock(&usecnt_lock); + ast_mutex_lock(&usecnt_lock); usecnt--; ast_mutex_unlock(&usecnt_lock); ast_update_use_count(); - /* SC: Decrement use count */ + /* SC: Decrement use count */ - if ((p->hookstate == MGCP_ONHOOK) && (!sub->next->rtp)) { - if (has_voicemail(p)) { - if (mgcpdebug) { - ast_verbose(VERBOSE_PREFIX_3 "MGCP mgcp_hangup(%s) on %s@%s set vmwi(+)\n", ast->name, p->name, p->parent->name); - } - transmit_notify_request(sub, "L/vmwi(+)"); - } else { - if (mgcpdebug) { - ast_verbose(VERBOSE_PREFIX_3 "MGCP mgcp_hangup(%s) on %s@%s set vmwi(-)\n", ast->name, p->name, p->parent->name); - } - transmit_notify_request(sub, "L/vmwi(-)"); - } - } + if ((p->hookstate == MGCP_ONHOOK) && (!sub->next->rtp)) { + if (has_voicemail(p)) { + if (mgcpdebug) { + ast_verbose(VERBOSE_PREFIX_3 "MGCP mgcp_hangup(%s) on %s@%s set vmwi(+)\n", + ast->name, p->name, p->parent->name); + } + transmit_notify_request(sub, "L/vmwi(+)"); + } else { + if (mgcpdebug) { + ast_verbose(VERBOSE_PREFIX_3 "MGCP mgcp_hangup(%s) on %s@%s set vmwi(-)\n", + ast->name, p->name, p->parent->name); + } + transmit_notify_request(sub, "L/vmwi(-)"); + } + } ast_mutex_unlock(&sub->lock); return 0; } @@ -1011,6 +1008,7 @@ struct mgcp_endpoint *e; int hasendpoints = 0; char iabuf[INET_ADDRSTRLEN]; + if (argc != 3) return RESULT_SHOWUSAGE; ast_mutex_lock(&gatelock); @@ -1036,7 +1034,7 @@ static char show_endpoints_usage[] = "Usage: mgcp show endpoints\n" -" Lists all endpoints known to the MGCP (Media Gateawy Control Protocol) subsystem.\n"; +" Lists all endpoints known to the MGCP (Media Gateway Control Protocol) subsystem.\n"; static struct ast_cli_entry cli_show_endpoints = { { "mgcp", "show", "endpoints", NULL }, mgcp_show_endpoints, "Show defined MGCP endpoints", show_endpoints_usage }; @@ -1046,56 +1044,57 @@ struct mgcp_gateway *g; struct mgcp_endpoint *e; int found = 0; - char *ename,*gname, *c; + char *ename,*gname, *c; + if (!mgcpdebug) { return RESULT_SHOWUSAGE; - } + } if (argc != 4) return RESULT_SHOWUSAGE; - /* split the name into parts by null */ - ename = argv[3]; - gname = ename; - while (*gname) { - if (*gname == '@') { - *gname = 0; - gname++; - break; - } - gname++; - } + /* split the name into parts by null */ + ename = argv[3]; + gname = ename; + while (*gname) { + if (*gname == '@') { + *gname = 0; + gname++; + break; + } + gname++; + } if (gname[0] == '[') gname++; - if ((c = strrchr(gname, ']'))) + if (c = strrchr(gname, ']')) *c = '\0'; ast_mutex_lock(&gatelock); g = gateways; while(g) { - if (!strcasecmp(g->name, gname)) { - e = g->endpoints; - while(e) { - if (!strcasecmp(e->name, ename)) { - found = 1; - transmit_audit_endpoint(e); - break; - } - e = e->next; - } - if (found) { - break; - } - } - g = g->next; - } - if (!found) { - ast_cli(fd, " << Could not find endpoint >> "); - } + if (!strcasecmp(g->name, gname)) { + e = g->endpoints; + while(e) { + if (!strcasecmp(e->name, ename)) { + found = 1; + transmit_audit_endpoint(e); + break; + } + e = e->next; + } + if (found) { + break; + } + } + g = g->next; + } + if (!found) { + ast_cli(fd, " << Could not find endpoint >> "); + } ast_mutex_unlock(&gatelock); return RESULT_SUCCESS; } static char audit_endpoint_usage[] = "Usage: mgcp audit endpoint \n" -" List the capabilities of an endpoint in the MGCP (Media Gateawy Control Protocol) subsystem.\n" +" Lists the capabilities of an endpoint in the MGCP (Media Gateway Control Protocol) subsystem.\n" " mgcp debug MUST be on to see the results of this command.\n"; static struct ast_cli_entry cli_audit_endpoint = @@ -1106,17 +1105,19 @@ int res = 0; struct mgcp_subchannel *sub = ast->pvt->pvt; struct mgcp_endpoint *p = sub->parent; + ast_mutex_lock(&sub->lock); - sub->cxmode = MGCP_CX_SENDRECV; - if (!sub->rtp) { - start_rtp(sub); - } else { - transmit_modify_request(sub); - } - /* SC: verbose level check */ - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "MGCP mgcp_answer(%s) on %s@%s-%d\n", ast->name, p->name, p->parent->name, sub->id); - } + sub->cxmode = MGCP_CX_SENDRECV; + if (!sub->rtp) { + start_rtp(sub); + } else { + transmit_modify_request(sub); + } + /* SC: verbose level check */ + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "MGCP mgcp_answer(%s) on %s@%s-%d\n", + ast->name, p->name, p->parent->name, sub->id); + } if (ast->_state != AST_STATE_UP) { ast_setstate(ast, AST_STATE_UP); if (option_debug) @@ -1133,6 +1134,7 @@ /* Retrieve audio/etc from channel. Assumes sub->lock is already held. */ struct ast_frame *f; static struct ast_frame null_frame = { AST_FRAME_NULL, }; + f = ast_rtp_read(sub->rtp); /* Don't send RFC2833 if we're not supposed to */ if (f && (f->frametype == AST_FRAME_DTMF) && !(sub->parent->dtmfmode & MGCP_DTMF_RFC2833)) @@ -1146,20 +1148,20 @@ ast_set_read_format(sub->owner, sub->owner->readformat); ast_set_write_format(sub->owner, sub->owner->writeformat); } - /* Courtesy fearnor aka alex@pilosoft.com */ - if ((sub->parent->dtmfmode & MGCP_DTMF_INBAND) && (sub->parent->dsp)) { + /* Courtesy fearnor aka alex@pilosoft.com */ + if ((sub->parent->dtmfmode & MGCP_DTMF_INBAND) && (sub->parent->dsp)) { #if 0 - ast_log(LOG_NOTICE, "MGCP ast_dsp_process\n"); + ast_log(LOG_NOTICE, "MGCP ast_dsp_process\n"); #endif - f = ast_dsp_process(sub->owner, sub->parent->dsp, f); - } + f = ast_dsp_process(sub->owner, sub->parent->dsp, f); + } } } return f; } -static struct ast_frame *mgcp_read(struct ast_channel *ast) +static struct ast_frame *mgcp_read(struct ast_channel *ast) { struct ast_frame *f; struct mgcp_subchannel *sub = ast->pvt->pvt; @@ -1202,8 +1204,9 @@ static int mgcp_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) { struct mgcp_subchannel *sub = newchan->pvt->pvt; + ast_mutex_lock(&sub->lock); - ast_log(LOG_NOTICE, "mgcp_fixup(%s, %s)\n", oldchan->name, newchan->name); + ast_log(LOG_NOTICE, "mgcp_fixup(%s, %s)\n", oldchan->name, newchan->name); if (sub->owner != oldchan) { ast_mutex_unlock(&sub->lock); ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, sub->owner); @@ -1218,6 +1221,7 @@ { struct mgcp_subchannel *sub = ast->pvt->pvt; char tmp[4]; + tmp[0] = 'D'; tmp[1] = '/'; tmp[2] = digit; @@ -1229,45 +1233,46 @@ } static char *control2str(int ind) { - switch (ind) { - case AST_CONTROL_HANGUP: - return "Other end has hungup"; - case AST_CONTROL_RING: - return "Local ring"; - case AST_CONTROL_RINGING: - return "Remote end is ringing"; - case AST_CONTROL_ANSWER: - return "Remote end has answered"; - case AST_CONTROL_BUSY: - return "Remote end is busy"; - case AST_CONTROL_TAKEOFFHOOK: - return "Make it go off hook"; - case AST_CONTROL_OFFHOOK: - return "Line is off hook"; - case AST_CONTROL_CONGESTION: - return "Congestion (circuits busy)"; - case AST_CONTROL_FLASH: - return "Flash hook"; - case AST_CONTROL_WINK: - return "Wink"; - case AST_CONTROL_OPTION: - return "Set a low-level option"; - case AST_CONTROL_RADIO_KEY: - return "Key Radio"; - case AST_CONTROL_RADIO_UNKEY: - return "Un-Key Radio"; - } - return "UNKNOWN"; + switch (ind) { + case AST_CONTROL_HANGUP: + return "Other end has hungup"; + case AST_CONTROL_RING: + return "Local ring"; + case AST_CONTROL_RINGING: + return "Remote end is ringing"; + case AST_CONTROL_ANSWER: + return "Remote end has answered"; + case AST_CONTROL_BUSY: + return "Remote end is busy"; + case AST_CONTROL_TAKEOFFHOOK: + return "Make it go off hook"; + case AST_CONTROL_OFFHOOK: + return "Line is off hook"; + case AST_CONTROL_CONGESTION: + return "Congestion (circuits busy)"; + case AST_CONTROL_FLASH: + return "Flash hook"; + case AST_CONTROL_WINK: + return "Wink"; + case AST_CONTROL_OPTION: + return "Set a low-level option"; + case AST_CONTROL_RADIO_KEY: + return "Key Radio"; + case AST_CONTROL_RADIO_UNKEY: + return "Un-Key Radio"; + } + return "UNKNOWN"; } - static int mgcp_indicate(struct ast_channel *ast, int ind) { struct mgcp_subchannel *sub = ast->pvt->pvt; int res = 0; - if (mgcpdebug) { - ast_verbose(VERBOSE_PREFIX_3 "MGCP asked to indicate %d '%s' condition on channel %s\n", ind, control2str(ind), ast->name); - } + + if (mgcpdebug) { + ast_verbose(VERBOSE_PREFIX_3 "MGCP asked to indicate %d '%s' condition on channel %s\n", + ind, control2str(ind), ast->name); + } ast_mutex_lock(&sub->lock); switch(ind) { case AST_CONTROL_RINGING: @@ -1297,9 +1302,10 @@ static struct ast_channel *mgcp_new(struct mgcp_subchannel *sub, int state) { struct ast_channel *tmp; - struct mgcp_endpoint *i = sub->parent; + struct mgcp_endpoint *i = sub->parent; int fmt; - i = sub->parent; + + i = sub->parent; tmp = ast_channel_alloc(1); if (tmp) { tmp->nativeformats = i->capability; @@ -1311,12 +1317,12 @@ tmp->fds[0] = ast_rtp_fd(sub->rtp); tmp->type = type; if (i->dtmfmode & MGCP_DTMF_INBAND) { - i->dsp = ast_dsp_new(); - ast_dsp_set_features(i->dsp,DSP_FEATURE_DTMF_DETECT); - /* SC: this is to prevent clipping of dtmf tones during dsp processing */ - ast_dsp_digitmode(i->dsp, DSP_DIGITMODE_NOQUELCH); + i->dsp = ast_dsp_new(); + ast_dsp_set_features(i->dsp,DSP_FEATURE_DTMF_DETECT); + /* SC: this is to prevent clipping of dtmf tones during dsp processing */ + ast_dsp_digitmode(i->dsp, DSP_DIGITMODE_NOQUELCH); } else { - i->dsp = NULL; + i->dsp = NULL; } ast_setstate(tmp, state); if (state == AST_STATE_RING) @@ -1365,51 +1371,54 @@ tmp = NULL; } } - /* SC: verbose level check */ - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "MGCP mgcp_new(%s) created in state: %s\n", tmp->name, ast_state2str(state)); - } + /* SC: verbose level check */ + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "MGCP mgcp_new(%s) created in state: %s\n", + tmp->name, ast_state2str(state)); + } } else { ast_log(LOG_WARNING, "Unable to allocate channel structure\n"); - } + } return tmp; } -static char* get_sdp_by_line(char* line, char *name, int nameLen) { - if (strncasecmp(line, name, nameLen) == 0 && line[nameLen] == '=') { - char* r = line + nameLen + 1; - while (*r && (*r < 33)) ++r; - return r; - } - - return ""; -} - -static char *get_sdp(struct mgcp_request *req, char *name) { - int x; - int len = strlen(name); - char *r; - - for (x=0; xlines; x++) { - r = get_sdp_by_line(req->line[x], name, len); - if (r[0] != '\0') return r; - } - return ""; -} - -static void sdpLineNum_iterator_init(int* iterator) { - *iterator = 0; -} - -static char* get_sdp_iterate(int* iterator, - struct mgcp_request *req, char *name) { - int len = strlen(name); - char *r; - while (*iterator < req->lines) { - r = get_sdp_by_line(req->line[(*iterator)++], name, len); - if (r[0] != '\0') return r; - } - return ""; +static char* get_sdp_by_line(char* line, char *name, int nameLen) +{ + if (strncasecmp(line, name, nameLen) == 0 && line[nameLen] == '=') { + char* r = line + nameLen + 1; + while (*r && (*r < 33)) ++r; + return r; + } + return ""; +} + +static char *get_sdp(struct mgcp_request *req, char *name) +{ + int x; + int len = strlen(name); + char *r; + + for (x=0; xlines; x++) { + r = get_sdp_by_line(req->line[x], name, len); + if (r[0] != '\0') return r; + } + return ""; +} + +static void sdpLineNum_iterator_init(int* iterator) +{ + *iterator = 0; +} + +static char* get_sdp_iterate(int* iterator, struct mgcp_request *req, char *name) +{ + int len = strlen(name); + char *r; + while (*iterator < req->lines) { + r = get_sdp_by_line(req->line[(*iterator)++], name, len); + if (r[0] != '\0') return r; + } + return ""; } static char *__get_header(struct mgcp_request *req, char *name, int *start) @@ -1419,12 +1428,12 @@ char *r; for (x=*start;xheaders;x++) { if (!strncasecmp(req->header[x], name, len) && - (req->header[x][len] == ':')) { - r = req->header[x] + len + 1; - while(*r && (*r < 33)) - r++; - *start = x+1; - return r; + (req->header[x][len] == ':')) { + r = req->header[x] + len + 1; + while(*r && (*r < 33)) + r++; + *start = x+1; + return r; } } /* Don't return NULL, so get_header is always a valid pointer */ @@ -1440,24 +1449,24 @@ /* SC: get comma separated value */ static char *get_csv(char *c, int *len, char **next) { - char *s; + char *s; + + *next = NULL, *len = 0; + if (!c) return NULL; + + while (*c && (*c < 33 || *c == ',')) + c++; - *next = NULL, *len = 0; - if (!c) return NULL; + s = c; + while (*c && (*c >= 33 && *c != ',')) + c++, (*len)++; + *next = c; - while(*c && (*c < 33 || *c == ',')) - c++; - - s = c; - while(*c && (*c >= 33 && *c != ',')) - c++, (*len)++; - *next = c; - - if (*len == 0) - s = NULL, *next = NULL; - - return s; -} + if (*len == 0) + s = NULL, *next = NULL; + + return s; +} static struct mgcp_subchannel *find_subchannel_and_lock(char *name, int msgid, struct sockaddr_in *sin) { @@ -1467,7 +1476,7 @@ char iabuf[INET_ADDRSTRLEN]; char tmp[256] = ""; char *at = NULL, *c; - int found = 0; + int found = 0; if (name) { strncpy(tmp, name, sizeof(tmp) - 1); at = strchr(tmp, '@'); @@ -1500,66 +1509,68 @@ ast_verbose(VERBOSE_PREFIX_3 "Registered MGCP gateway '%s' at %s port %d\n", g->name, ast_inet_ntoa(iabuf, sizeof(iabuf), g->addr.sin_addr), ntohs(g->addr.sin_port)); } } - /* SC: not dynamic, check if the name matches */ - else if (name) { - if (strcasecmp(g->name, at)) { - g = g->next; - continue; - } - } - /* SC: not dynamic, no name, check if the addr matches */ - else if (!name && sin) { + /* SC: not dynamic, check if the name matches */ + else if (name) { + if (strcasecmp(g->name, at)) { + g = g->next; + continue; + } + } + /* SC: not dynamic, no name, check if the addr matches */ + else if (!name && sin) { if ((g->addr.sin_addr.s_addr != sin->sin_addr.s_addr) || - (g->addr.sin_port != sin->sin_port)) { - g = g->next; - continue; - } - } - else { - g = g->next; - continue; - } - /* SC */ + (g->addr.sin_port != sin->sin_port)) { + g = g->next; + continue; + } + } else { + g = g->next; + continue; + } + /* SC */ p = g->endpoints; while(p) { if (option_debug) - ast_log(LOG_DEBUG, "Searching on %s@%s for subchannel\n", p->name, g->name); - if (msgid) { + ast_log(LOG_DEBUG, "Searching on %s@%s for subchannel\n", + p->name, g->name); + if (msgid) { #if 0 /* SC: new transport mech */ - sub = p->sub; - do { + sub = p->sub; + do { if (option_debug) - ast_log(LOG_DEBUG, "Searching on %s@%s-%d for subchannel with lastout: %d\n", p->name, g->name, sub->id, msgid); - if (sub->lastout == msgid) { + ast_log(LOG_DEBUG, "Searching on %s@%s-%d for subchannel with lastout: %d\n", + p->name, g->name, sub->id, msgid); + if (sub->lastout == msgid) { if (option_debug) - ast_log(LOG_DEBUG, "Found subchannel sub%d to handle request %d sub->lastout: %d\n", sub->id, msgid, sub->lastout); - found = 1; - break; - } - sub = sub->next; - } while (sub != p->sub); - if (found) { - break; - } + ast_log(LOG_DEBUG, "Found subchannel sub%d to handle request %d sub->lastout: %d\n", + sub->id, msgid, sub->lastout); + found = 1; + break; + } + sub = sub->next; + } while (sub != p->sub); + if (found) { + break; + } #endif - /* SC */ - sub = p->sub; - found = 1; - /* SC */ - break; - } else if (name && !strcasecmp(p->name, tmp)) { - ast_log(LOG_DEBUG, "Coundn't determine subchannel, assuming current master %s@%s-%d\n", - p->name, g->name, p->sub->id); - sub = p->sub; - found = 1; - break; - } - p = p->next; + /* SC */ + sub = p->sub; + found = 1; + /* SC */ + break; + } else if (name && !strcasecmp(p->name, tmp)) { + ast_log(LOG_DEBUG, "Coundn't determine subchannel, assuming current master %s@%s-%d\n", + p->name, g->name, p->sub->id); + sub = p->sub; + found = 1; + break; + } + p = p->next; } if (sub && found) { ast_mutex_lock(&sub->lock); break; - } + } } g = g->next; } @@ -1567,7 +1578,7 @@ if (!sub) { if (name) { if (g) - ast_log(LOG_NOTICE, "Endpoint '%s' not found on gateway '%s'\n", tmp,at); + ast_log(LOG_NOTICE, "Endpoint '%s' not found on gateway '%s'\n", tmp, at); else ast_log(LOG_NOTICE, "Gateway '%s' (and thus its endpoint '%s') does not exist\n", at, tmp); } @@ -1588,7 +1599,6 @@ if (*c == '\n') { /* We've got a new header */ *c = 0; - #if 0 printf("Header: %s (%d)\n", req->header[f], strlen(req->header[f])); #endif @@ -1670,7 +1680,7 @@ if (mgcpdebug) { ast_verbose("Verb: '%s', Identifier: '%s', Endpoint: '%s', Version: '%s'\n", - req->verb, req->identifier, req->endpoint, req->version); + req->verb, req->identifier, req->endpoint, req->version); ast_verbose("%d headers, %d lines\n", req->headers, req->lines); } if (*c) @@ -1691,7 +1701,7 @@ struct ast_hostent ahp; struct hostent *hp; int codec; int iterator; - struct mgcp_endpoint *p = sub->parent; + struct mgcp_endpoint *p = sub->parent; /* Get codec and RTP info from SDP */ m = get_sdp(req, "m"); @@ -1722,7 +1732,7 @@ printf("Peer RTP is at port %s:%d\n", ast_inet_ntoa(iabuf, sizeof(iabuf), sin.sin_addr), ntohs(sin.sin_port)); #endif /* Scan through the RTP payload types specified in a "m=" line: */ - ast_rtp_pt_clear(sub->rtp); + ast_rtp_pt_clear(sub->rtp); codecs = m + len; while(strlen(codecs)) { if (sscanf(codecs, "%d %n", &codec, &len) != 1) { @@ -1733,33 +1743,32 @@ codecs += len; } - /* Next, scan through each "a=rtpmap:" line, noting each */ - /* specified RTP payload type (with corresponding MIME subtype): */ - sdpLineNum_iterator_init(&iterator); - while ((a = get_sdp_iterate(&iterator, req, "a"))[0] != '\0') { - char* mimeSubtype = strdup(a); /* ensures we have enough space */ - if (sscanf(a, "rtpmap: %u %[^/]/", &codec, mimeSubtype) != 2) continue; - /* Note: should really look at the 'freq' and '#chans' params too */ - ast_rtp_set_rtpmap_type(sub->rtp, codec, "audio", mimeSubtype); - free(mimeSubtype); - } - - /* Now gather all of the codecs that were asked for: */ - ast_rtp_get_current_formats(sub->rtp, - &peercapability, &peerNonCodecCapability); + /* Next, scan through each "a=rtpmap:" line, noting each */ + /* specified RTP payload type (with corresponding MIME subtype): */ + sdpLineNum_iterator_init(&iterator); + while ((a = get_sdp_iterate(&iterator, req, "a"))[0] != '\0') { + char* mimeSubtype = strdup(a); /* ensures we have enough space */ + if (sscanf(a, "rtpmap: %u %[^/]/", &codec, mimeSubtype) != 2) + continue; + /* Note: should really look at the 'freq' and '#chans' params too */ + ast_rtp_set_rtpmap_type(sub->rtp, codec, "audio", mimeSubtype); + free(mimeSubtype); + } + + /* Now gather all of the codecs that were asked for: */ + ast_rtp_get_current_formats(sub->rtp, &peercapability, &peerNonCodecCapability); p->capability = capability & peercapability; if (mgcpdebug) { ast_verbose("Capabilities: us - %d, them - %d, combined - %d\n", - capability, peercapability, p->capability); + capability, peercapability, p->capability); ast_verbose("Non-codec capabilities: us - %d, them - %d, combined - %d\n", - nonCodecCapability, peerNonCodecCapability, p->nonCodecCapability); + nonCodecCapability, peerNonCodecCapability, p->nonCodecCapability); } if (!p->capability) { ast_log(LOG_WARNING, "No compatible codecs!\n"); return -1; } return 0; - } static int add_header(struct mgcp_request *req, char *var, char *value) @@ -1832,11 +1841,11 @@ return -1; } req->header[req->headers] = req->data + req->len; - /* SC: check if we need brackets around the gw name */ - if (p->parent->isnamedottedip) - snprintf(req->header[req->headers], sizeof(req->data) - req->len, "%s %d %s@[%s] MGCP 1.0\r\n", verb, oseq, p->name, p->parent->name); - else - snprintf(req->header[req->headers], sizeof(req->data) - req->len, "%s %d %s@%s MGCP 1.0\r\n", verb, oseq, p->name, p->parent->name); + /* SC: check if we need brackets around the gw name */ + if (p->parent->isnamedottedip) + snprintf(req->header[req->headers], sizeof(req->data) - req->len, "%s %d %s@[%s] MGCP 1.0\r\n", verb, oseq, p->name, p->parent->name); + else + snprintf(req->header[req->headers], sizeof(req->data) - req->len, "%s %d %s@%s MGCP 1.0\r\n", verb, oseq, p->name, p->parent->name); req->len += strlen(req->header[req->headers]); if (req->headers < MGCP_MAX_HEADERS) req->headers++; @@ -1866,8 +1875,9 @@ static int transmit_response(struct mgcp_subchannel *sub, char *msg, struct mgcp_request *req, char *msgrest) { struct mgcp_request resp; - struct mgcp_endpoint *p = sub->parent; + struct mgcp_endpoint *p = sub->parent; struct mgcp_response *mgr; + respprep(&resp, p, msg, req, msgrest); mgr = malloc(sizeof(struct mgcp_response) + resp.len + 1); if (mgr) { @@ -1901,7 +1911,7 @@ char iabuf[INET_ADDRSTRLEN]; int x; struct sockaddr_in dest; - struct mgcp_endpoint *p = sub->parent; + struct mgcp_endpoint *p = sub->parent; /* XXX We break with the "recommendation" and send our IP, in order that our peer doesn't have to ast_gethostbyname() us XXX */ len = 0; @@ -1924,8 +1934,8 @@ } } if (mgcpdebug) { - ast_verbose("We're at %s port %d\n", ast_inet_ntoa(iabuf, sizeof(iabuf), p->parent->ourip), ntohs(sin.sin_port)); - } + ast_verbose("We're at %s port %d\n", ast_inet_ntoa(iabuf, sizeof(iabuf), p->parent->ourip), ntohs(sin.sin_port)); + } snprintf(v, sizeof(v), "v=0\r\n"); snprintf(o, sizeof(o), "o=root %d %d IN IP4 %s\r\n", getpid(), getpid(), ast_inet_ntoa(iabuf, sizeof(iabuf), dest.sin_addr)); snprintf(s, sizeof(s), "s=session\r\n"); @@ -1936,9 +1946,9 @@ if (p->capability & x) { if (mgcpdebug) { ast_verbose("Answering with capability %d\n", x); - } + } codec = ast_rtp_lookup_code(sub->rtp, 1, x); - if (codec > -1) { + if (codec > -1) { snprintf(costr, sizeof(costr), " %d", codec); strncat(m, costr, sizeof(m) - strlen(m) - 1); snprintf(costr, sizeof(costr), "a=rtpmap:%d %s/8000\r\n", codec, ast_rtp_lookup_mime_subtype(1, x)); @@ -1947,24 +1957,25 @@ } } for (x = 1; x <= AST_RTP_MAX; x <<= 1) { - if (p->nonCodecCapability & x) { - if (mgcpdebug) { - ast_verbose("Answering with non-codec capability %d\n", x); - } - codec = ast_rtp_lookup_code(sub->rtp, 0, x); - if (codec > -1) { - snprintf(costr, sizeof(costr), " %d", codec); - strncat(m, costr, sizeof(m) - strlen(m) - 1); - snprintf(costr, sizeof(costr), "a=rtpmap:%d %s/8000\r\n", codec, ast_rtp_lookup_mime_subtype(0, x)); - strncat(a, costr, sizeof(a) - strlen(a) - 1); - if (x == AST_RTP_DTMF) { - /* Indicate we support DTMF... Not sure about 16, but MSN supports it so dang it, we will too... */ - snprintf(costr, sizeof costr, "a=fmtp:%d 0-16\r\n", codec); - strncat(a, costr, sizeof(a) - strlen(a) - 1); - } - } - } - } + if (p->nonCodecCapability & x) { + if (mgcpdebug) { + ast_verbose("Answering with non-codec capability %d\n", x); + } + codec = ast_rtp_lookup_code(sub->rtp, 0, x); + if (codec > -1) { + snprintf(costr, sizeof(costr), " %d", codec); + strncat(m, costr, sizeof(m) - strlen(m) - 1); + snprintf(costr, sizeof(costr), "a=rtpmap:%d %s/8000\r\n", codec, ast_rtp_lookup_mime_subtype(0, x)); + strncat(a, costr, sizeof(a) - strlen(a) - 1); + if (x == AST_RTP_DTMF) { + /* Indicate we support DTMF... Not sure about 16, + but MSN supports it so dang it, we will too... */ + snprintf(costr, sizeof costr, "a=fmtp:%d 0-16\r\n", codec); + strncat(a, costr, sizeof(a) - strlen(a) - 1); + } + } + } + } strncat(m, "\r\n", sizeof(m) - strlen(m) - 1); len = strlen(v) + strlen(s) + strlen(o) + strlen(c) + strlen(t) + strlen(m) + strlen(a); snprintf(costr, sizeof(costr), "%d", len); @@ -1985,7 +1996,8 @@ char tmp[80]; int x; int capability; - struct mgcp_endpoint *p = sub->parent; + struct mgcp_endpoint *p = sub->parent; + capability = p->capability; if (codecs) capability = codecs; @@ -2006,15 +2018,15 @@ add_header(&resp, "C", sub->callid); add_header(&resp, "L", local); add_header(&resp, "M", mgcp_cxmodes[sub->cxmode]); - /* SC: X header should not be sent. kept for compatibility */ + /* SC: X header should not be sent. kept for compatibility */ add_header(&resp, "X", sub->txident); add_header(&resp, "I", sub->cxident); /*add_header(&resp, "S", "");*/ ast_rtp_offered_from_local(sub->rtp, 0); add_sdp(&resp, sub, rtp); - /* SC: fill in new fields */ - resp.cmd = MGCP_CMD_MDCX; - resp.trid = oseq; + /* SC: fill in new fields */ + resp.cmd = MGCP_CMD_MDCX; + resp.trid = oseq; return send_request(p, sub, &resp, oseq); /* SC */ } @@ -2024,7 +2036,7 @@ char local[256]; char tmp[80]; int x; - struct mgcp_endpoint *p = sub->parent; + struct mgcp_endpoint *p = sub->parent; snprintf(local, sizeof(local), "p:20"); for (x=1;x<= AST_FORMAT_MAX_AUDIO; x <<= 1) { @@ -2033,51 +2045,51 @@ strncat(local, tmp, sizeof(local) - strlen(local) - 1); } } - if (mgcpdebug) { - ast_verbose(VERBOSE_PREFIX_3 "Creating connection for %s@%s-%d in cxmode: %s callid: %s\n", - p->name, p->parent->name, sub->id, mgcp_cxmodes[sub->cxmode], sub->callid); - } + if (mgcpdebug) { + ast_verbose(VERBOSE_PREFIX_3 "Creating connection for %s@%s-%d in cxmode: %s callid: %s\n", + p->name, p->parent->name, sub->id, mgcp_cxmodes[sub->cxmode], sub->callid); + } reqprep(&resp, p, "CRCX"); add_header(&resp, "C", sub->callid); add_header(&resp, "L", local); add_header(&resp, "M", mgcp_cxmodes[sub->cxmode]); - /* SC: X header should not be sent. kept for compatibility */ + /* SC: X header should not be sent. kept for compatibility */ add_header(&resp, "X", sub->txident); /*add_header(&resp, "S", "");*/ ast_rtp_offered_from_local(sub->rtp, 1); add_sdp(&resp, sub, rtp); - /* SC: fill in new fields */ - resp.cmd = MGCP_CMD_CRCX; - resp.trid = oseq; + /* SC: fill in new fields */ + resp.cmd = MGCP_CMD_CRCX; + resp.trid = oseq; return send_request(p, sub, &resp, oseq); /* SC */ } static int transmit_notify_request(struct mgcp_subchannel *sub, char *tone) { struct mgcp_request resp; - struct mgcp_endpoint *p = sub->parent; + struct mgcp_endpoint *p = sub->parent; - if (mgcpdebug) { - ast_verbose(VERBOSE_PREFIX_3 "MGCP Asked to indicate tone: %s on %s@%s-%d in cxmode: %s\n", - tone, p->name, p->parent->name, sub->id, mgcp_cxmodes[sub->cxmode]); - } + if (mgcpdebug) { + ast_verbose(VERBOSE_PREFIX_3 "MGCP Asked to indicate tone: %s on %s@%s-%d in cxmode: %s\n", + tone, p->name, p->parent->name, sub->id, mgcp_cxmodes[sub->cxmode]); + } strncpy(p->curtone, tone, sizeof(p->curtone) - 1); reqprep(&resp, p, "RQNT"); add_header(&resp, "X", p->rqnt_ident); /* SC */ - switch (p->hookstate) { - case MGCP_ONHOOK: - add_header(&resp, "R", "L/hd(N)"); - break; - case MGCP_OFFHOOK: - add_header(&resp, "R", (sub->rtp && (p->dtmfmode & MGCP_DTMF_INBAND)) ? "L/hu(N),L/hf(N)" : "L/hu(N),L/hf(N),D/[0-9#*](N)"); - break; - } - if (strlen(tone)) { - add_header(&resp, "S", tone); - } - /* SC: fill in new fields */ - resp.cmd = MGCP_CMD_RQNT; - resp.trid = oseq; + switch (p->hookstate) { + case MGCP_ONHOOK: + add_header(&resp, "R", "L/hd(N)"); + break; + case MGCP_OFFHOOK: + add_header(&resp, "R", (sub->rtp && (p->dtmfmode & MGCP_DTMF_INBAND)) ? "L/hu(N),L/hf(N)" : "L/hu(N),L/hf(N),D/[0-9#*](N)"); + break; + } + if (strlen(tone)) { + add_header(&resp, "S", tone); + } + /* SC: fill in new fields */ + resp.cmd = MGCP_CMD_RQNT; + resp.trid = oseq; return send_request(p, NULL, &resp, oseq); /* SC */ } @@ -2088,7 +2100,7 @@ char *l, *n; time_t t; struct tm tm; - struct mgcp_endpoint *p = sub->parent; + struct mgcp_endpoint *p = sub->parent; time(&t); localtime_r(&t,&tm); @@ -2099,65 +2111,66 @@ if (!l) l = ""; - /* Keep track of last callerid for blacklist and callreturn */ - strncpy(p->lastcallerid, l, sizeof(p->lastcallerid) - 1); + /* Keep track of last callerid for blacklist and callreturn */ + strncpy(p->lastcallerid, l, sizeof(p->lastcallerid) - 1); snprintf(tone2, sizeof(tone2), "%s,L/ci(%02d/%02d/%02d/%02d,%s,%s)", tone, - tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, l, n); + tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, l, n); strncpy(p->curtone, tone, sizeof(p->curtone) - 1); reqprep(&resp, p, "RQNT"); add_header(&resp, "X", p->rqnt_ident); /* SC */ - switch (p->hookstate) { - case MGCP_ONHOOK: - add_header(&resp, "R", "L/hd(N)"); - break; - case MGCP_OFFHOOK: - add_header(&resp, "R", (sub->rtp && (p->dtmfmode & MGCP_DTMF_INBAND)) ? "L/hu(N),L/hf(N)" : "L/hu(N),L/hf(N),D/[0-9#*](N)"); - break; - } - if (strlen(tone2)) { - add_header(&resp, "S", tone2); - } - if (mgcpdebug) { - ast_verbose(VERBOSE_PREFIX_3 "MGCP Asked to indicate tone: %s on %s@%s-%d in cxmode: %s\n", - tone2, p->name, p->parent->name, sub->id, mgcp_cxmodes[sub->cxmode]); - } - /* SC: fill in new fields */ - resp.cmd = MGCP_CMD_RQNT; - resp.trid = oseq; + switch (p->hookstate) { + case MGCP_ONHOOK: + add_header(&resp, "R", "L/hd(N)"); + break; + case MGCP_OFFHOOK: + add_header(&resp, "R", (sub->rtp && (p->dtmfmode & MGCP_DTMF_INBAND)) ? "L/hu(N),L/hf(N)" : "L/hu(N),L/hf(N),D/[0-9#*](N)"); + break; + } + if (strlen(tone2)) { + add_header(&resp, "S", tone2); + } + if (mgcpdebug) { + ast_verbose(VERBOSE_PREFIX_3 "MGCP Asked to indicate tone: %s on %s@%s-%d in cxmode: %s\n", + tone2, p->name, p->parent->name, sub->id, mgcp_cxmodes[sub->cxmode]); + } + /* SC: fill in new fields */ + resp.cmd = MGCP_CMD_RQNT; + resp.trid = oseq; return send_request(p, NULL, &resp, oseq); /* SC */ } static int transmit_modify_request(struct mgcp_subchannel *sub) { struct mgcp_request resp; - struct mgcp_endpoint *p = sub->parent; + struct mgcp_endpoint *p = sub->parent; + if (!strlen(sub->cxident)) { /* We don't have a CXident yet, store the destination and wait a bit */ return 0; } - if (mgcpdebug) { - ast_verbose(VERBOSE_PREFIX_3 "Modified %s@%s-%d with new mode: %s on callid: %s\n", - p->name, p->parent->name, sub->id, mgcp_cxmodes[sub->cxmode], sub->callid); - } + if (mgcpdebug) { + ast_verbose(VERBOSE_PREFIX_3 "Modified %s@%s-%d with new mode: %s on callid: %s\n", + p->name, p->parent->name, sub->id, mgcp_cxmodes[sub->cxmode], sub->callid); + } reqprep(&resp, p, "MDCX"); add_header(&resp, "C", sub->callid); add_header(&resp, "M", mgcp_cxmodes[sub->cxmode]); - /* SC: X header should not be sent. kept for compatibility */ + /* SC: X header should not be sent. kept for compatibility */ add_header(&resp, "X", sub->txident); add_header(&resp, "I", sub->cxident); - switch (sub->parent->hookstate) { - case MGCP_ONHOOK: - add_header(&resp, "R", "L/hd(N)"); - break; - case MGCP_OFFHOOK: - add_header(&resp, "R", (sub->rtp && (p->dtmfmode & MGCP_DTMF_INBAND)) ? "L/hu(N), L/hf(N)" : "L/hu(N),L/hf(N),D/[0-9#*](N)"); - break; - } - /* SC: fill in new fields */ - resp.cmd = MGCP_CMD_MDCX; - resp.trid = oseq; + switch (sub->parent->hookstate) { + case MGCP_ONHOOK: + add_header(&resp, "R", "L/hd(N)"); + break; + case MGCP_OFFHOOK: + add_header(&resp, "R", (sub->rtp && (p->dtmfmode & MGCP_DTMF_INBAND)) ? "L/hu(N), L/hf(N)" : "L/hu(N),L/hf(N),D/[0-9#*](N)"); + break; + } + /* SC: fill in new fields */ + resp.cmd = MGCP_CMD_MDCX; + resp.trid = oseq; return send_request(p, sub, &resp, oseq); /* SC */ } @@ -2166,90 +2179,91 @@ { struct mgcp_request resp; reqprep(&resp, p, "AUEP"); - /* SC: removed unknown param VS */ - /*add_header(&resp, "F", "A,R,D,S,X,N,I,T,O,ES,E,MD,M"); */ + /* SC: removed unknown param VS */ + /*add_header(&resp, "F", "A,R,D,S,X,N,I,T,O,ES,E,MD,M");*/ add_header(&resp, "F", "A"); - /* SC: fill in new fields */ - resp.cmd = MGCP_CMD_AUEP; - resp.trid = oseq; + /* SC: fill in new fields */ + resp.cmd = MGCP_CMD_AUEP; + resp.trid = oseq; return send_request(p, NULL, &resp, oseq); /* SC */ } static int transmit_connection_del(struct mgcp_subchannel *sub) { - struct mgcp_endpoint *p = sub->parent; + struct mgcp_endpoint *p = sub->parent; struct mgcp_request resp; - if (mgcpdebug) { - ast_verbose(VERBOSE_PREFIX_3 "Delete connection %s %s@%s-%d with new mode: %s on callid: %s\n", - sub->cxident, p->name, p->parent->name, sub->id, mgcp_cxmodes[sub->cxmode], sub->callid); - } + + if (mgcpdebug) { + ast_verbose(VERBOSE_PREFIX_3 "Delete connection %s %s@%s-%d with new mode: %s on callid: %s\n", + sub->cxident, p->name, p->parent->name, sub->id, mgcp_cxmodes[sub->cxmode], sub->callid); + } reqprep(&resp, p, "DLCX"); - /* SC: check if call id is avail */ - if (sub->callid[0]) - add_header(&resp, "C", sub->callid); - /* SC: X header should not be sent. kept for compatibility */ + /* SC: check if call id is avail */ + if (sub->callid[0]) + add_header(&resp, "C", sub->callid); + /* SC: X header should not be sent. kept for compatibility */ add_header(&resp, "X", sub->txident); - /* SC: check if cxident is avail */ - if (sub->cxident[0]) - add_header(&resp, "I", sub->cxident); - /* SC: fill in new fields */ - resp.cmd = MGCP_CMD_DLCX; - resp.trid = oseq; + /* SC: check if cxident is avail */ + if (sub->cxident[0]) + add_header(&resp, "I", sub->cxident); + /* SC: fill in new fields */ + resp.cmd = MGCP_CMD_DLCX; + resp.trid = oseq; return send_request(p, sub, &resp, oseq); /* SC */ } static int transmit_connection_del_w_params(struct mgcp_endpoint *p, char *callid, char *cxident) { struct mgcp_request resp; - if (mgcpdebug) { - ast_verbose(VERBOSE_PREFIX_3 "Delete connection %s %s@%s on callid: %s\n", - cxident ? cxident : "", p->name, p->parent->name, callid ? callid : ""); - } + + if (mgcpdebug) { + ast_verbose(VERBOSE_PREFIX_3 "Delete connection %s %s@%s on callid: %s\n", + cxident ? cxident : "", p->name, p->parent->name, callid ? callid : ""); + } reqprep(&resp, p, "DLCX"); - /* SC: check if call id is avail */ - if (callid && *callid) - add_header(&resp, "C", callid); - /* SC: check if cxident is avail */ - if (cxident && *cxident) - add_header(&resp, "I", cxident); - /* SC: fill in new fields */ - resp.cmd = MGCP_CMD_DLCX; - resp.trid = oseq; + /* SC: check if call id is avail */ + if (callid && *callid) + add_header(&resp, "C", callid); + /* SC: check if cxident is avail */ + if (cxident && *cxident) + add_header(&resp, "I", cxident); + /* SC: fill in new fields */ + resp.cmd = MGCP_CMD_DLCX; + resp.trid = oseq; return send_request(p, p->sub, &resp, oseq); } -/* SC: cleanup pendng commands */ +/* SC: cleanup pending commands */ static void dump_cmd_queues(struct mgcp_endpoint *p, struct mgcp_subchannel *sub) { - struct mgcp_request *t, *q; + struct mgcp_request *t, *q; - if (p) { - ast_mutex_lock(&p->rqnt_queue_lock); - for (q = p->rqnt_queue; q; t = q->next, free(q), q=t); - p->rqnt_queue = NULL; - ast_mutex_unlock(&p->rqnt_queue_lock); - - ast_mutex_lock(&p->cmd_queue_lock); - for (q = p->cmd_queue; q; t = q->next, free(q), q=t); - p->cmd_queue = NULL; - ast_mutex_unlock(&p->cmd_queue_lock); - - ast_mutex_lock(&p->sub->cx_queue_lock); - for (q = p->sub->cx_queue; q; t = q->next, free(q), q=t); - p->sub->cx_queue = NULL; - ast_mutex_unlock(&p->sub->cx_queue_lock); - - ast_mutex_lock(&p->sub->next->cx_queue_lock); - for (q = p->sub->next->cx_queue; q; t = q->next, free(q), q=t); - p->sub->next->cx_queue = NULL; - ast_mutex_unlock(&p->sub->next->cx_queue_lock); - } - else if (sub){ - ast_mutex_lock(&sub->cx_queue_lock); - for (q = sub->cx_queue; q; t = q->next, free(q), q=t); - sub->cx_queue = NULL; - ast_mutex_unlock(&sub->cx_queue_lock); - } + if (p) { + ast_mutex_lock(&p->rqnt_queue_lock); + for (q = p->rqnt_queue; q; t = q->next, free(q), q=t); + p->rqnt_queue = NULL; + ast_mutex_unlock(&p->rqnt_queue_lock); + + ast_mutex_lock(&p->cmd_queue_lock); + for (q = p->cmd_queue; q; t = q->next, free(q), q=t); + p->cmd_queue = NULL; + ast_mutex_unlock(&p->cmd_queue_lock); + + ast_mutex_lock(&p->sub->cx_queue_lock); + for (q = p->sub->cx_queue; q; t = q->next, free(q), q=t); + p->sub->cx_queue = NULL; + ast_mutex_unlock(&p->sub->cx_queue_lock); + + ast_mutex_lock(&p->sub->next->cx_queue_lock); + for (q = p->sub->next->cx_queue; q; t = q->next, free(q), q=t); + p->sub->next->cx_queue = NULL; + ast_mutex_unlock(&p->sub->next->cx_queue_lock); + } else if (sub) { + ast_mutex_lock(&sub->cx_queue_lock); + for (q = sub->cx_queue; q; t = q->next, free(q), q=t); + sub->cx_queue = NULL; + ast_mutex_unlock(&sub->cx_queue_lock); + } } @@ -2257,226 +2271,223 @@ static struct mgcp_request *find_command(struct mgcp_endpoint *p, struct mgcp_subchannel *sub, struct mgcp_request **queue, ast_mutex_t *l, int ident) { - struct mgcp_request *prev, *req; + struct mgcp_request *prev, *req; char iabuf[INET_ADDRSTRLEN]; - ast_mutex_lock(l); - for (prev = NULL, req = *queue; req; prev = req, req = req->next) { - if (req->trid == ident) { - /* remove from queue */ - if (!prev) - *queue = req->next; - else - prev->next = req->next; - - /* send next pending command */ - if (*queue) { - if (mgcpdebug) { - ast_verbose("Posting Queued Request:\n%s to %s:%d\n", (*queue)->data, - ast_inet_ntoa(iabuf, sizeof(iabuf), p->parent->addr.sin_addr), ntohs(p->parent->addr.sin_port)); - } - - mgcp_postrequest(p, sub, (*queue)->data, (*queue)->len, (*queue)->trid); - } - break; - } - } - ast_mutex_unlock(l); - return req; + ast_mutex_lock(l); + for (prev = NULL, req = *queue; req; prev = req, req = req->next) { + if (req->trid == ident) { + /* remove from queue */ + if (!prev) + *queue = req->next; + else + prev->next = req->next; + + /* send next pending command */ + if (*queue) { + if (mgcpdebug) { + ast_verbose("Posting Queued Request:\n%s to %s:%d\n", (*queue)->data, + ast_inet_ntoa(iabuf, sizeof(iabuf), p->parent->addr.sin_addr), ntohs(p->parent->addr.sin_port)); + } + + mgcp_postrequest(p, sub, (*queue)->data, (*queue)->len, (*queue)->trid); + } + break; + } + } + ast_mutex_unlock(l); + return req; } /* SC: modified for new transport mechanism */ static void handle_response(struct mgcp_endpoint *p, struct mgcp_subchannel *sub, int result, unsigned int ident, struct mgcp_request *resp) { - char *c; - struct mgcp_request *req; - struct mgcp_gateway *gw = p->parent; - - if (result < 200) { - /* provisional response */ - return; - } + char *c; + struct mgcp_request *req; + struct mgcp_gateway *gw = p->parent; + + if (result < 200) { + /* provisional response */ + return; + } if (p->slowsequence) req = find_command(p, sub, &p->cmd_queue, &p->cmd_queue_lock, ident); else if (sub) - req = find_command(p, sub, &sub->cx_queue, &sub->cx_queue_lock, ident); - else if (!(req = find_command(p, sub, &p->rqnt_queue, &p->rqnt_queue_lock, ident))) - req = find_command(p, sub, &p->cmd_queue, &p->cmd_queue_lock, ident); - - if (!req) { - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "No command found on [%s] for transaction %d. Ignoring...\n", - gw->name, ident); - } - return; - } - - if (p && (result >= 400) && (result <= 599)) { - switch (result) { - case 401: - p->hookstate = MGCP_OFFHOOK; - break; - case 402: - p->hookstate = MGCP_ONHOOK; - break; - case 406: - ast_log(LOG_NOTICE, "Transaction %d timed out\n", ident); - break; - case 407: - ast_log(LOG_NOTICE, "Transaction %d aborted\n", ident); - break; - } - if (sub) - { - if (sub->owner) { - ast_log(LOG_NOTICE, "Terminating on result %d from %s@%s-%d\n", - result, p->name, p->parent->name, sub ? sub->id:-1); - mgcp_queue_hangup(sub); - } - } - else { - if (p->sub->next->owner) { - ast_log(LOG_NOTICE, "Terminating on result %d from %s@%s-%d\n", - result, p->name, p->parent->name, sub ? sub->id:-1); - mgcp_queue_hangup(p->sub); - } - - if (p->sub->owner) { - ast_log(LOG_NOTICE, "Terminating on result %d from %s@%s-%d\n", - result, p->name, p->parent->name, sub ? sub->id:-1); - mgcp_queue_hangup(p->sub); - } - - dump_cmd_queues(p, NULL); - } - } - - if (resp) { - if (req->cmd == MGCP_CMD_CRCX) { - if ((c = get_header(resp, "I"))) { - if (strlen(c) && sub) { - /* SC: if we are hanging up do not process this conn. */ - if (sub->owner) { - if (strlen(sub->cxident)) { - if (strcasecmp(c, sub->cxident)) { - ast_log(LOG_WARNING, "Subchannel already has a cxident. sub->cxident: %s requested %s\n", sub->cxident, c); - } - } - strncpy(sub->cxident, c, sizeof(sub->cxident) - 1); - if (sub->tmpdest.sin_addr.s_addr) { - transmit_modify_with_sdp(sub, NULL, 0); - } - } - else { - /* XXX SC: delete this one - callid and conn id may already be lost. - so the following del conn may have a side effect of - cleaning up the next subchannel */ - transmit_connection_del(sub); - } - } - } - } - - if (req->cmd == MGCP_CMD_AUEP) { - /* SC: check stale connection ids */ - if ((c = get_header(resp, "I"))) { - char *v, *n; - int len; - while ((v = get_csv(c, &len, &n))) { - if (len) { - if(strncasecmp(v, p->sub->cxident, len) && - strncasecmp(v, p->sub->next->cxident, len)) { - /* connection id not found. delete it */ - char cxident[80]; - memcpy(cxident, v, len); - cxident[len] = '\0'; - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "Non existing connection id %s on %s@%s \n", - cxident, p->name, gw->name); - } - transmit_connection_del_w_params(p, NULL, cxident); - } - } - c = n; - } - } - - /* Try to determine the hookstate returned from an audit endpoint command */ - if ((c = get_header(resp, "ES"))) { - if (strlen(c)) { - if (strstr(c, "hu")) { - if (p->hookstate != MGCP_ONHOOK) { - /* SC: XXX cleanup if we think we are offhook XXX */ - if ((p->sub->owner || p->sub->next->owner ) && - p->hookstate == MGCP_OFFHOOK) - mgcp_queue_hangup(sub); - p->hookstate = MGCP_ONHOOK; - - /* SC: update the requested events according to the new hookstate */ - transmit_notify_request(p->sub, ""); - - /* SC: verbose level check */ - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "Setting hookstate of %s@%s to ONHOOK\n", p->name, gw->name); - } - } - } else if (strstr(c, "hd")) { - if (p->hookstate != MGCP_OFFHOOK) { - p->hookstate = MGCP_OFFHOOK; - - /* SC: update the requested events according to the new hookstate */ - transmit_notify_request(p->sub, ""); - - /* SC: verbose level check */ - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "Setting hookstate of %s@%s to OFFHOOK\n", p->name, gw->name); - } - } - } - } - } - } - - if (resp && resp->lines) { - /* SC: do not process sdp if we are hanging up. this may be a late response */ - if (sub && sub->owner) { - if (!sub->rtp) - start_rtp(sub); - if (sub->rtp) - process_sdp(sub, resp); - } - } - } + req = find_command(p, sub, &sub->cx_queue, &sub->cx_queue_lock, ident); + else if (!(req = find_command(p, sub, &p->rqnt_queue, &p->rqnt_queue_lock, ident))) + req = find_command(p, sub, &p->cmd_queue, &p->cmd_queue_lock, ident); + + if (!req) { + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "No command found on [%s] for transaction %d. Ignoring...\n", + gw->name, ident); + } + return; + } - free(req); + if (p && (result >= 400) && (result <= 599)) { + switch (result) { + case 401: + p->hookstate = MGCP_OFFHOOK; + break; + case 402: + p->hookstate = MGCP_ONHOOK; + break; + case 406: + ast_log(LOG_NOTICE, "Transaction %d timed out\n", ident); + break; + case 407: + ast_log(LOG_NOTICE, "Transaction %d aborted\n", ident); + break; + } + if (sub) { + if (sub->owner) { + ast_log(LOG_NOTICE, "Terminating on result %d from %s@%s-%d\n", + result, p->name, p->parent->name, sub ? sub->id:-1); + mgcp_queue_hangup(sub); + } + } else { + if (p->sub->next->owner) { + ast_log(LOG_NOTICE, "Terminating on result %d from %s@%s-%d\n", + result, p->name, p->parent->name, sub ? sub->id:-1); + mgcp_queue_hangup(p->sub); + } + + if (p->sub->owner) { + ast_log(LOG_NOTICE, "Terminating on result %d from %s@%s-%d\n", + result, p->name, p->parent->name, sub ? sub->id:-1); + mgcp_queue_hangup(p->sub); + } + + dump_cmd_queues(p, NULL); + } + } + + if (resp) { + if (req->cmd == MGCP_CMD_CRCX) { + if ((c = get_header(resp, "I"))) { + if (strlen(c) && sub) { + /* SC: if we are hanging up do not process this conn. */ + if (sub->owner) { + if (strlen(sub->cxident)) { + if (strcasecmp(c, sub->cxident)) { + ast_log(LOG_WARNING, "Subchannel already has a cxident. sub->cxident: %s requested %s\n", sub->cxident, c); + } + } + strncpy(sub->cxident, c, sizeof(sub->cxident) - 1); + if (sub->tmpdest.sin_addr.s_addr) { + transmit_modify_with_sdp(sub, NULL, 0); + } + } else { + /* XXX SC: delete this one + callid and conn id may already be lost. + so the following del conn may have a side effect of + cleaning up the next subchannel */ + transmit_connection_del(sub); + } + } + } + } + + if (req->cmd == MGCP_CMD_AUEP) { + /* SC: check stale connection ids */ + if ((c = get_header(resp, "I"))) { + char *v, *n; + int len; + while ((v = get_csv(c, &len, &n))) { + if (len) { + if (strncasecmp(v, p->sub->cxident, len) && + strncasecmp(v, p->sub->next->cxident, len)) { + /* connection id not found. delete it */ + char cxident[80]; + memcpy(cxident, v, len); + cxident[len] = '\0'; + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "Non existing connection id %s on %s@%s \n", + cxident, p->name, gw->name); + } + transmit_connection_del_w_params(p, NULL, cxident); + } + } + c = n; + } + } + + /* Try to determine the hookstate returned from an audit endpoint command */ + if ((c = get_header(resp, "ES"))) { + if (strlen(c)) { + if (strstr(c, "hu")) { + if (p->hookstate != MGCP_ONHOOK) { + /* SC: XXX cleanup if we think we are offhook XXX */ + if ((p->sub->owner || p->sub->next->owner ) && + p->hookstate == MGCP_OFFHOOK) + mgcp_queue_hangup(sub); + p->hookstate = MGCP_ONHOOK; + + /* SC: update the requested events according to the new hookstate */ + transmit_notify_request(p->sub, ""); + + /* SC: verbose level check */ + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "Setting hookstate of %s@%s to ONHOOK\n", p->name, gw->name); + } + } + } else if (strstr(c, "hd")) { + if (p->hookstate != MGCP_OFFHOOK) { + p->hookstate = MGCP_OFFHOOK; + + /* SC: update the requested events according to the new hookstate */ + transmit_notify_request(p->sub, ""); + + /* SC: verbose level check */ + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "Setting hookstate of %s@%s to OFFHOOK\n", p->name, gw->name); + } + } + } + } + } + } + + if (resp && resp->lines) { + /* SC: do not process sdp if we are hanging up. this may be a late response */ + if (sub && sub->owner) { + if (!sub->rtp) + start_rtp(sub); + if (sub->rtp) + process_sdp(sub, resp); + } + } + } + + free(req); } static void start_rtp(struct mgcp_subchannel *sub) { - ast_mutex_lock(&sub->lock); - /* SC: check again to be on the safe side */ - if (sub->rtp) { - ast_rtp_destroy(sub->rtp); - sub->rtp = NULL; - } - /* Allocate the RTP now */ - sub->rtp = ast_rtp_new_with_bindaddr(sched, io, 1, 0, bindaddr.sin_addr); - if (sub->rtp && sub->owner) - sub->owner->fds[0] = ast_rtp_fd(sub->rtp); - if (sub->rtp) - ast_rtp_setnat(sub->rtp, sub->nat); + ast_mutex_lock(&sub->lock); + /* SC: check again to be on the safe side */ + if (sub->rtp) { + ast_rtp_destroy(sub->rtp); + sub->rtp = NULL; + } + /* Allocate the RTP now */ + sub->rtp = ast_rtp_new_with_bindaddr(sched, io, 1, 0, bindaddr.sin_addr); + if (sub->rtp && sub->owner) + sub->owner->fds[0] = ast_rtp_fd(sub->rtp); + if (sub->rtp) + ast_rtp_setnat(sub->rtp, sub->nat); #if 0 - ast_rtp_set_callback(p->rtp, rtpready); - ast_rtp_set_data(p->rtp, p); + ast_rtp_set_callback(p->rtp, rtpready); + ast_rtp_set_data(p->rtp, p); #endif - /* Make a call*ID */ + /* Make a call*ID */ snprintf(sub->callid, sizeof(sub->callid), "%08x%s", rand(), sub->txident); - /* Transmit the connection create */ - transmit_connect_with_sdp(sub, NULL); - ast_mutex_unlock(&sub->lock); + /* Transmit the connection create */ + transmit_connect_with_sdp(sub, NULL); + ast_mutex_unlock(&sub->lock); } static void *mgcp_ss(void *data) @@ -2488,233 +2499,231 @@ int len = 0; int timeout = firstdigittimeout; int res; - int getforward=0; - while(len < AST_MAX_EXTENSION-1) { - res = ast_waitfordigit(chan, timeout); - timeout = 0; - if (res < 0) { - ast_log(LOG_DEBUG, "waitfordigit returned < 0...\n"); - /*res = tone_zone_play_tone(p->subs[index].zfd, -1);*/ + int getforward = 0; + + while(len < AST_MAX_EXTENSION-1) { + res = ast_waitfordigit(chan, timeout); + timeout = 0; + if (res < 0) { + ast_log(LOG_DEBUG, "waitfordigit returned < 0...\n"); + /*res = tone_zone_play_tone(p->subs[index].zfd, -1);*/ ast_indicate(chan, -1); - ast_hangup(chan); - return NULL; - } else if (res) { - exten[len++]=res; - exten[len] = '\0'; - } - if (!ast_ignore_pattern(chan->context, exten)) { - /*res = tone_zone_play_tone(p->subs[index].zfd, -1);*/ + ast_hangup(chan); + return NULL; + } else if (res) { + exten[len++]=res; + exten[len] = '\0'; + } + if (!ast_ignore_pattern(chan->context, exten)) { + /*res = tone_zone_play_tone(p->subs[index].zfd, -1);*/ ast_indicate(chan, -1); - } else { - /* XXX Redundant? We should already be playing dialtone */ - /*tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALTONE);*/ - transmit_notify_request(sub, "L/dl"); - } - if (ast_exists_extension(chan, chan->context, exten, 1, p->cid_num)) { - if (!res || !ast_matchmore_extension(chan, chan->context, exten, 1, p->cid_num)) { - if (getforward) { - /* Record this as the forwarding extension */ - strncpy(p->call_forward, exten, sizeof(p->call_forward) - 1); - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "Setting call forward to '%s' on channel %s\n", - p->call_forward, chan->name); - } - /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ - transmit_notify_request(sub, "L/sl"); - if (res) - break; - usleep(500000); - /*res = tone_zone_play_tone(p->subs[index].zfd, -1);*/ - ast_indicate(chan, -1); - sleep(1); - memset(exten, 0, sizeof(exten)); - /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALTONE);*/ - transmit_notify_request(sub, "L/dl"); - len = 0; - getforward = 0; - } else { - /*res = tone_zone_play_tone(p->subs[index].zfd, -1);*/ - ast_indicate(chan, -1); - strncpy(chan->exten, exten, sizeof(chan->exten)-1); - if (!ast_strlen_zero(p->cid_num)) { - if (!p->hidecallerid) { - /* SC: free existing chan->callerid */ - if (chan->cid.cid_num) - free(chan->cid.cid_num); - chan->cid.cid_num = strdup(p->cid_num); - /* SC: free existing chan->callerid */ - if (chan->cid.cid_name) - free(chan->cid.cid_name); - chan->cid.cid_name = strdup(p->cid_name); - } - if (chan->cid.cid_ani) - free(chan->cid.cid_ani); - chan->cid.cid_ani = strdup(p->cid_num); - } - ast_setstate(chan, AST_STATE_RING); - /*zt_enable_ec(p);*/ - res = ast_pbx_run(chan); - if (res) { - ast_log(LOG_WARNING, "PBX exited non-zero\n"); - /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_CONGESTION);*/ - /*transmit_notify_request(p, "nbz", 1);*/ - transmit_notify_request(sub, "G/cg"); - } - return NULL; - } - } else { - /* It's a match, but they just typed a digit, and there is an ambiguous match, - so just set the timeout to matchdigittimeout and wait some more */ - timeout = matchdigittimeout; - } - } else if (res == 0) { - ast_log(LOG_DEBUG, "not enough digits (and no ambiguous match)...\n"); - /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_CONGESTION);*/ - transmit_notify_request(sub, "G/cg"); - /*zt_wait_event(p->subs[index].zfd);*/ - ast_hangup(chan); - return NULL; - } else if (p->callwaiting && !strcmp(exten, "*70")) { - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "Disabling call waiting on %s\n", chan->name); - } - /* Disable call waiting if enabled */ - p->callwaiting = 0; - /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ - transmit_notify_request(sub, "L/sl"); - len = 0; - memset(exten, 0, sizeof(exten)); - timeout = firstdigittimeout; - - } else if (!strcmp(exten,ast_pickup_ext())) { - /* Scan all channels and see if any there - * ringing channqels with that have call groups - * that equal this channels pickup group - */ - if (ast_pickup_call(chan)) { - ast_log(LOG_WARNING, "No call pickup possible...\n"); - /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_CONGESTION);*/ - transmit_notify_request(sub, "G/cg"); - } - ast_hangup(chan); - return NULL; - - } else if (!p->hidecallerid && !strcmp(exten, "*67")) { - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "Disabling Caller*ID on %s\n", chan->name); - } - /* Disable Caller*ID if enabled */ - p->hidecallerid = 1; - if (chan->cid.cid_num) - free(chan->cid.cid_num); - chan->cid.cid_num = NULL; - if (chan->cid.cid_name) - free(chan->cid.cid_name); - chan->cid.cid_name = NULL; - /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ - transmit_notify_request(sub, "L/sl"); - len = 0; - memset(exten, 0, sizeof(exten)); - timeout = firstdigittimeout; - } else if (p->callreturn && !strcmp(exten, "*69")) { - res = 0; - if (strlen(p->lastcallerid)) { - res = ast_say_digit_str(chan, p->lastcallerid, "", chan->language); - } - if (!res) - /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ - transmit_notify_request(sub, "L/sl"); - break; - } else if (!strcmp(exten, "*78")) { - /* Do not disturb */ - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "Enabled DND on channel %s\n", chan->name); - } - /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ - transmit_notify_request(sub, "L/sl"); - p->dnd = 1; - getforward = 0; - memset(exten, 0, sizeof(exten)); - len = 0; - } else if (!strcmp(exten, "*79")) { - /* Do not disturb */ - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "Disabled DND on channel %s\n", chan->name); - } - /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ - transmit_notify_request(sub, "L/sl"); - p->dnd = 0; - getforward = 0; - memset(exten, 0, sizeof(exten)); - len = 0; - } else if (p->cancallforward && !strcmp(exten, "*72")) { - /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ - transmit_notify_request(sub, "L/sl"); - getforward = 1; - memset(exten, 0, sizeof(exten)); - len = 0; - } else if (p->cancallforward && !strcmp(exten, "*73")) { - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "Cancelling call forwarding on channel %s\n", chan->name); - } - /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ - transmit_notify_request(sub, "L/sl"); - memset(p->call_forward, 0, sizeof(p->call_forward)); - getforward = 0; - memset(exten, 0, sizeof(exten)); - len = 0; - } else if (!strcmp(exten, ast_parking_ext()) && - sub->next->owner && - ast_bridged_channel(sub->next->owner)) { - /* This is a three way call, the main call being a real channel, - and we're parking the first call. */ - ast_masq_park_call(ast_bridged_channel(sub->next->owner), chan, 0, NULL); - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "Parking call to '%s'\n", chan->name); - } - break; - } else if (strlen(p->lastcallerid) && !strcmp(exten, "*60")) { - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "Blacklisting number %s\n", p->lastcallerid); - } - res = ast_db_put("blacklist", p->lastcallerid, "1"); - if (!res) { - /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ - transmit_notify_request(sub, "L/sl"); - memset(exten, 0, sizeof(exten)); - len = 0; - } - } else if (p->hidecallerid && !strcmp(exten, "*82")) { - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "Enabling Caller*ID on %s\n", chan->name); - } - /* Enable Caller*ID if enabled */ - p->hidecallerid = 0; - if (chan->cid.cid_num) - free(chan->cid.cid_num); - if (!ast_strlen_zero(p->cid_num)) - chan->cid.cid_num = strdup(p->cid_num); - if (chan->cid.cid_name) - free(chan->cid.cid_name); - if (!ast_strlen_zero(p->cid_name)) - chan->cid.cid_name = strdup(p->cid_name); - /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ - transmit_notify_request(sub, "L/sl"); - len = 0; - memset(exten, 0, sizeof(exten)); - timeout = firstdigittimeout; - } else if (!ast_canmatch_extension(chan, chan->context, exten, 1, chan->cid.cid_num) && - ((exten[0] != '*') || (strlen(exten) > 2))) { - if (option_debug) - ast_log(LOG_DEBUG, "Can't match %s from '%s' in context %s\n", exten, chan->cid.cid_num ? chan->cid.cid_num : "", chan->context); - break; - } - if (!timeout) - timeout = gendigittimeout; - if (len && !ast_ignore_pattern(chan->context, exten)) - /*tone_zone_play_tone(p->subs[index].zfd, -1);*/ + } else { + /* XXX Redundant? We should already be playing dialtone */ + /*tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALTONE);*/ + transmit_notify_request(sub, "L/dl"); + } + if (ast_exists_extension(chan, chan->context, exten, 1, p->cid_num)) { + if (!res || !ast_matchmore_extension(chan, chan->context, exten, 1, p->cid_num)) { + if (getforward) { + /* Record this as the forwarding extension */ + strncpy(p->call_forward, exten, sizeof(p->call_forward) - 1); + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "Setting call forward to '%s' on channel %s\n", + p->call_forward, chan->name); + } + /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ + transmit_notify_request(sub, "L/sl"); + if (res) + break; + usleep(500000); + /*res = tone_zone_play_tone(p->subs[index].zfd, -1);*/ + ast_indicate(chan, -1); + sleep(1); + memset(exten, 0, sizeof(exten)); + /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALTONE);*/ + transmit_notify_request(sub, "L/dl"); + len = 0; + getforward = 0; + } else { + /*res = tone_zone_play_tone(p->subs[index].zfd, -1);*/ + ast_indicate(chan, -1); + strncpy(chan->exten, exten, sizeof(chan->exten)-1); + if (!ast_strlen_zero(p->cid_num)) { + if (!p->hidecallerid) { + /* SC: free existing chan->callerid */ + if (chan->cid.cid_num) + free(chan->cid.cid_num); + chan->cid.cid_num = strdup(p->cid_num); + /* SC: free existing chan->callerid */ + if (chan->cid.cid_name) + free(chan->cid.cid_name); + chan->cid.cid_name = strdup(p->cid_name); + } + if (chan->cid.cid_ani) + free(chan->cid.cid_ani); + chan->cid.cid_ani = strdup(p->cid_num); + } + ast_setstate(chan, AST_STATE_RING); + /*zt_enable_ec(p);*/ + res = ast_pbx_run(chan); + if (res) { + ast_log(LOG_WARNING, "PBX exited non-zero\n"); + /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_CONGESTION);*/ + /*transmit_notify_request(p, "nbz", 1);*/ + transmit_notify_request(sub, "G/cg"); + } + return NULL; + } + } else { + /* It's a match, but they just typed a digit, and there is an ambiguous match, + so just set the timeout to matchdigittimeout and wait some more */ + timeout = matchdigittimeout; + } + } else if (res == 0) { + ast_log(LOG_DEBUG, "not enough digits (and no ambiguous match)...\n"); + /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_CONGESTION);*/ + transmit_notify_request(sub, "G/cg"); + /*zt_wait_event(p->subs[index].zfd);*/ + ast_hangup(chan); + return NULL; + } else if (p->callwaiting && !strcmp(exten, "*70")) { + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "Disabling call waiting on %s\n", chan->name); + } + /* Disable call waiting if enabled */ + p->callwaiting = 0; + /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ + transmit_notify_request(sub, "L/sl"); + len = 0; + memset(exten, 0, sizeof(exten)); + timeout = firstdigittimeout; + } else if (!strcmp(exten,ast_pickup_ext())) { + /* Scan all channels and see if any there + * ringing channqels with that have call groups + * that equal this channels pickup group + */ + if (ast_pickup_call(chan)) { + ast_log(LOG_WARNING, "No call pickup possible...\n"); + /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_CONGESTION);*/ + transmit_notify_request(sub, "G/cg"); + } + ast_hangup(chan); + return NULL; + } else if (!p->hidecallerid && !strcmp(exten, "*67")) { + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "Disabling Caller*ID on %s\n", chan->name); + } + /* Disable Caller*ID if enabled */ + p->hidecallerid = 1; + if (chan->cid.cid_num) + free(chan->cid.cid_num); + chan->cid.cid_num = NULL; + if (chan->cid.cid_name) + free(chan->cid.cid_name); + chan->cid.cid_name = NULL; + /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ + transmit_notify_request(sub, "L/sl"); + len = 0; + memset(exten, 0, sizeof(exten)); + timeout = firstdigittimeout; + } else if (p->callreturn && !strcmp(exten, "*69")) { + res = 0; + if (strlen(p->lastcallerid)) { + res = ast_say_digit_str(chan, p->lastcallerid, "", chan->language); + } + if (!res) + /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ + transmit_notify_request(sub, "L/sl"); + break; + } else if (!strcmp(exten, "*78")) { + /* Do not disturb */ + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "Enabled DND on channel %s\n", chan->name); + } + /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ + transmit_notify_request(sub, "L/sl"); + p->dnd = 1; + getforward = 0; + memset(exten, 0, sizeof(exten)); + len = 0; + } else if (!strcmp(exten, "*79")) { + /* Do not disturb */ + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "Disabled DND on channel %s\n", chan->name); + } + /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ + transmit_notify_request(sub, "L/sl"); + p->dnd = 0; + getforward = 0; + memset(exten, 0, sizeof(exten)); + len = 0; + } else if (p->cancallforward && !strcmp(exten, "*72")) { + /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ + transmit_notify_request(sub, "L/sl"); + getforward = 1; + memset(exten, 0, sizeof(exten)); + len = 0; + } else if (p->cancallforward && !strcmp(exten, "*73")) { + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "Cancelling call forwarding on channel %s\n", chan->name); + } + /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ + transmit_notify_request(sub, "L/sl"); + memset(p->call_forward, 0, sizeof(p->call_forward)); + getforward = 0; + memset(exten, 0, sizeof(exten)); + len = 0; + } else if (!strcmp(exten, ast_parking_ext()) && + sub->next->owner && ast_bridged_channel(sub->next->owner)) { + /* This is a three way call, the main call being a real channel, + and we're parking the first call. */ + ast_masq_park_call(ast_bridged_channel(sub->next->owner), chan, 0, NULL); + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "Parking call to '%s'\n", chan->name); + } + break; + } else if (strlen(p->lastcallerid) && !strcmp(exten, "*60")) { + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "Blacklisting number %s\n", p->lastcallerid); + } + res = ast_db_put("blacklist", p->lastcallerid, "1"); + if (!res) { + /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ + transmit_notify_request(sub, "L/sl"); + memset(exten, 0, sizeof(exten)); + len = 0; + } + } else if (p->hidecallerid && !strcmp(exten, "*82")) { + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "Enabling Caller*ID on %s\n", chan->name); + } + /* Enable Caller*ID if enabled */ + p->hidecallerid = 0; + if (chan->cid.cid_num) + free(chan->cid.cid_num); + if (!ast_strlen_zero(p->cid_num)) + chan->cid.cid_num = strdup(p->cid_num); + if (chan->cid.cid_name) + free(chan->cid.cid_name); + if (!ast_strlen_zero(p->cid_name)) + chan->cid.cid_name = strdup(p->cid_name); + /*res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);*/ + transmit_notify_request(sub, "L/sl"); + len = 0; + memset(exten, 0, sizeof(exten)); + timeout = firstdigittimeout; + } else if (!ast_canmatch_extension(chan, chan->context, exten, 1, chan->cid.cid_num) && + ((exten[0] != '*') || (strlen(exten) > 2))) { + if (option_debug) + ast_log(LOG_DEBUG, "Can't match %s from '%s' in context %s\n", exten, chan->cid.cid_num ? chan->cid.cid_num : "", chan->context); + break; + } + if (!timeout) + timeout = gendigittimeout; + if (len && !ast_ignore_pattern(chan->context, exten)) + /*tone_zone_play_tone(p->subs[index].zfd, -1);*/ ast_indicate(chan, -1); - } + } #if 0 for (;;) { res = ast_waitfordigit(chan, to); @@ -2724,7 +2733,7 @@ } if (res < 0) { ast_log(LOG_DEBUG, "Got hangup...\n"); - ast_hangup(chan); + ast_hangup(chan); break; } exten[pos++] = res; @@ -2740,9 +2749,9 @@ } if (ast_exists_extension(chan, chan->context, exten, 1, chan->callerid)) { strncpy(chan->exten, exten, sizeof(chan->exten) - 1); - if (!p->rtp) { - start_rtp(p); - } + if (!p->rtp) { + start_rtp(p); + } ast_setstate(chan, AST_STATE_RING); chan->rings = 1; if (ast_pbx_run(chan)) { @@ -2757,11 +2766,11 @@ static int attempt_transfer(struct mgcp_endpoint *p) { - /* ************************* - * I hope this works. - * Copied out of chan_zap - * Cross your fingers - * *************************/ + /* ************************* + * I hope this works. + * Copied out of chan_zap + * Cross your fingers + * *************************/ /* In order to transfer, we need at least one of the channels to actually be in a call bridge. We can't conference two applications @@ -2776,7 +2785,7 @@ } if (ast_channel_masquerade(p->sub->next->owner, ast_bridged_channel(p->sub->owner))) { ast_log(LOG_WARNING, "Unable to masquerade %s as %s\n", - ast_bridged_channel(p->sub->owner)->name, p->sub->next->owner->name); + ast_bridged_channel(p->sub->owner)->name, p->sub->next->owner->name); return -1; } /* Orphan the channel */ @@ -2788,127 +2797,128 @@ ast_moh_stop(ast_bridged_channel(p->sub->next->owner)); if (ast_channel_masquerade(p->sub->owner, ast_bridged_channel(p->sub->next->owner))) { ast_log(LOG_WARNING, "Unable to masquerade %s as %s\n", - ast_bridged_channel(p->sub->next->owner)->name, p->sub->owner->name); + ast_bridged_channel(p->sub->next->owner)->name, p->sub->owner->name); return -1; } /*swap_subs(p, SUB_THREEWAY, SUB_REAL);*/ - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "Swapping %d for %d on %s@%s\n", p->sub->id, p->sub->next->id, p->name, p->parent->name); - } - p->sub = p->sub->next; + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "Swapping %d for %d on %s@%s\n", p->sub->id, p->sub->next->id, p->name, p->parent->name); + } + p->sub = p->sub->next; unalloc_sub(p->sub->next); /* Tell the caller not to hangup */ return 1; } else { ast_log(LOG_DEBUG, "Neither %s nor %s are in a bridge, nothing to transfer\n", - p->sub->owner->name, p->sub->next->owner->name); + p->sub->owner->name, p->sub->next->owner->name); p->sub->next->owner->_softhangup |= AST_SOFTHANGUP_DEV; - if (p->sub->next->owner) { - p->sub->next->alreadygone = 1; - mgcp_queue_hangup(p->sub->next); - } + if (p->sub->next->owner) { + p->sub->next->alreadygone = 1; + mgcp_queue_hangup(p->sub->next); + } } return 0; } static void handle_hd_hf(struct mgcp_subchannel *sub, char *ev) { - struct mgcp_endpoint *p = sub->parent; - struct ast_channel *c; + struct mgcp_endpoint *p = sub->parent; + struct ast_channel *c; pthread_t t; pthread_attr_t attr; pthread_attr_init(&attr); - pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); + pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - /* Off hook / answer */ - if (sub->outgoing) { - /* Answered */ - if (sub->owner) { - if (ast_bridged_channel(sub->owner)) { - ast_moh_stop(ast_bridged_channel(sub->owner)); - } - sub->cxmode = MGCP_CX_SENDRECV; - if (!sub->rtp) { - start_rtp(sub); - } else { - transmit_modify_request(sub); - } - /*transmit_notify_request(sub, "aw");*/ - transmit_notify_request(sub, ""); - mgcp_queue_control(sub, AST_CONTROL_ANSWER); - } - } else { - /* Start switch */ - /*sub->cxmode = MGCP_CX_SENDRECV;*/ - if (!sub->owner) { - if (!sub->rtp) { - start_rtp(sub); - } else { - transmit_modify_request(sub); - } - if (p->immediate) { - /* The channel is immediately up. Start right away */ + /* Off hook / answer */ + if (sub->outgoing) { + /* Answered */ + if (sub->owner) { + if (ast_bridged_channel(sub->owner)) { + ast_moh_stop(ast_bridged_channel(sub->owner)); + } + sub->cxmode = MGCP_CX_SENDRECV; + if (!sub->rtp) { + start_rtp(sub); + } else { + transmit_modify_request(sub); + } + /*transmit_notify_request(sub, "aw");*/ + transmit_notify_request(sub, ""); + mgcp_queue_control(sub, AST_CONTROL_ANSWER); + } + } else { + /* Start switch */ + /*sub->cxmode = MGCP_CX_SENDRECV;*/ + if (!sub->owner) { + if (!sub->rtp) { + start_rtp(sub); + } else { + transmit_modify_request(sub); + } + if (p->immediate) { + /* The channel is immediately up. Start right away */ #ifdef DLINK_BUGGY_FIRMWARE transmit_notify_request(sub, "rt"); #else transmit_notify_request(sub, "G/rt"); #endif - c = mgcp_new(sub, AST_STATE_RING); - if (!c) { - ast_log(LOG_WARNING, "Unable to start PBX on channel %s@%s\n", p->name, p->parent->name); - transmit_notify_request(sub, "G/cg"); - ast_hangup(c); - } - } else { - if (has_voicemail(p)) { - transmit_notify_request(sub, "L/sl"); - } else { - transmit_notify_request(sub, "L/dl"); - } - c = mgcp_new(sub, AST_STATE_DOWN); - if (c) { - if (ast_pthread_create(&t, &attr, mgcp_ss, c)) { - ast_log(LOG_WARNING, "Unable to create switch thread: %s\n", strerror(errno)); - ast_hangup(c); - } - } else { - ast_log(LOG_WARNING, "Unable to create channel for %s@%s\n", p->name, p->parent->name); - } - } - } else { - if (p->hookstate == MGCP_OFFHOOK) { - ast_log(LOG_WARNING, "Off hook, but already have owner on %s@%s\n", p->name, p->parent->name); - } else { - ast_log(LOG_WARNING, "On hook, but already have owner on %s@%s\n", p->name, p->parent->name); - ast_log(LOG_WARNING, "If we're onhook why are we here trying to handle a hd or hf?"); - } - if (ast_bridged_channel(sub->owner)) { - ast_moh_stop(ast_bridged_channel(sub->owner)); - } - sub->cxmode = MGCP_CX_SENDRECV; - if (!sub->rtp) { - start_rtp(sub); - } else { - transmit_modify_request(sub); - } - /*transmit_notify_request(sub, "aw");*/ - transmit_notify_request(sub, ""); - /*ast_queue_control(sub->owner, AST_CONTROL_ANSWER);*/ - } - } + c = mgcp_new(sub, AST_STATE_RING); + if (!c) { + ast_log(LOG_WARNING, "Unable to start PBX on channel %s@%s\n", p->name, p->parent->name); + transmit_notify_request(sub, "G/cg"); + ast_hangup(c); + } + } else { + if (has_voicemail(p)) { + transmit_notify_request(sub, "L/sl"); + } else { + transmit_notify_request(sub, "L/dl"); + } + c = mgcp_new(sub, AST_STATE_DOWN); + if (c) { + if (ast_pthread_create(&t, &attr, mgcp_ss, c)) { + ast_log(LOG_WARNING, "Unable to create switch thread: %s\n", strerror(errno)); + ast_hangup(c); + } + } else { + ast_log(LOG_WARNING, "Unable to create channel for %s@%s\n", p->name, p->parent->name); + } + } + } else { + if (p->hookstate == MGCP_OFFHOOK) { + ast_log(LOG_WARNING, "Off hook, but already have owner on %s@%s\n", p->name, p->parent->name); + } else { + ast_log(LOG_WARNING, "On hook, but already have owner on %s@%s\n", p->name, p->parent->name); + ast_log(LOG_WARNING, "If we're onhook why are we here trying to handle a hd or hf?"); + } + if (ast_bridged_channel(sub->owner)) { + ast_moh_stop(ast_bridged_channel(sub->owner)); + } + sub->cxmode = MGCP_CX_SENDRECV; + if (!sub->rtp) { + start_rtp(sub); + } else { + transmit_modify_request(sub); + } + /*transmit_notify_request(sub, "aw");*/ + transmit_notify_request(sub, ""); + /*ast_queue_control(sub->owner, AST_CONTROL_ANSWER);*/ + } + } } static int handle_request(struct mgcp_subchannel *sub, struct mgcp_request *req, struct sockaddr_in *sin) { char *ev, *s; struct ast_frame f = { 0, }; - struct mgcp_endpoint *p = sub->parent; - struct mgcp_gateway *g = NULL; + struct mgcp_endpoint *p = sub->parent; + struct mgcp_gateway *g = NULL; char iabuf[INET_ADDRSTRLEN]; - int res; + int res; + if (mgcpdebug) { ast_verbose("Handling request '%s' on %s@%s\n", req->verb, p->name, p->parent->name); - } + } /* Clear out potential response */ if (!strcasecmp(req->verb, "RSIP")) { /* Test if this RSIP request is just a keepalive */ @@ -2918,20 +2928,20 @@ transmit_response(sub, "200", req, "OK"); } else { dump_queue(p->parent, p); - dump_cmd_queues(p, NULL); + dump_cmd_queues(p, NULL); if (option_verbose > 2 && (strcmp(p->name, p->parent->wcardep) != 0)) { - ast_verbose(VERBOSE_PREFIX_3 "Resetting interface %s@%s\n", p->name, p->parent->name); + ast_verbose(VERBOSE_PREFIX_3 "Resetting interface %s@%s\n", p->name, p->parent->name); } /* JS: For RSIP on wildcard we reset all endpoints */ if (!strcmp(p->name, p->parent->wcardep)) { /* Reset all endpoints */ struct mgcp_endpoint *tmp_ep; - + g = p->parent; tmp_ep = g->endpoints; while (tmp_ep) { - /*if ((strcmp(tmp_ep->name, "*") != 0) && (strcmp(tmp_ep->name, "aaln/" "*") != 0)) { */ + /*if ((strcmp(tmp_ep->name, "*") != 0) && (strcmp(tmp_ep->name, "aaln/" "*") != 0)) {*/ if (strcmp(tmp_ep->name, g->wcardep) != 0) { struct mgcp_subchannel *tmp_sub, *first_sub; if (option_verbose > 2) { @@ -2941,22 +2951,22 @@ first_sub = tmp_ep->sub; tmp_sub = tmp_ep->sub; while (tmp_sub) { - mgcp_queue_hangup(tmp_sub); + mgcp_queue_hangup(tmp_sub); tmp_sub = tmp_sub->next; if (tmp_sub == first_sub) break; - } + } } tmp_ep = tmp_ep->next; } } else if (sub->owner) { - mgcp_queue_hangup(sub); + mgcp_queue_hangup(sub); } transmit_response(sub, "200", req, "OK"); /* JS: We dont send NTFY or AUEP to wildcard ep */ if (strcmp(p->name, p->parent->wcardep) != 0) { transmit_notify_request(sub, ""); - /* SC: Audit endpoint. + /* SC: Audit endpoint. Idea is to prevent lost lines due to race conditions */ transmit_audit_endpoint(p); @@ -2969,148 +2979,149 @@ ev = get_header(req, "O"); s = strchr(ev, '/'); if (s) ev = s + 1; - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "Endpoint '%s@%s-%d' observed '%s'\n", p->name, p->parent->name, sub->id, ev); - } + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "Endpoint '%s@%s-%d' observed '%s'\n", p->name, p->parent->name, sub->id, ev); + } /* Keep looking for events unless this was a hangup */ if (strcasecmp(ev, "hu") && strcasecmp(ev, "hd") && strcasecmp(ev, "ping")) { transmit_notify_request(sub, p->curtone); - } + } if (!strcasecmp(ev, "hd")) { - p->hookstate = MGCP_OFFHOOK; - sub->cxmode = MGCP_CX_SENDRECV; - handle_hd_hf(sub, ev); + p->hookstate = MGCP_OFFHOOK; + sub->cxmode = MGCP_CX_SENDRECV; + handle_hd_hf(sub, ev); } else if (!strcasecmp(ev, "hf")) { - /* We can assume we are offhook if we received a hookflash */ - /* First let's just do call wait and ignore threeway */ - /* We're currently in charge */ - if (p->hookstate != MGCP_OFFHOOK) { - /* Cisco c7940 sends hf even if the phone is onhook */ - /* Thanks to point on IRC for pointing this out */ - return -1; - } - /* do not let * confrnce two down channels */ - if( sub->owner && sub->owner->_state == AST_STATE_DOWN && !sub->next->owner) return -1; - - if (p->callwaiting || p->transfer || p->threewaycalling) { - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "Swapping %d for %d on %s@%s\n", p->sub->id, p->sub->next->id, p->name, p->parent->name); - } - p->sub = p->sub->next; - - /* transfer control to our next subchannel */ - if (!sub->next->owner) { - /* plave the first call on hold and start up a new call */ - sub->cxmode = MGCP_CX_MUTE; - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "MGCP Muting %d on %s@%s\n", sub->id, p->name, p->parent->name); - } - transmit_modify_request(sub); - if (sub->owner && ast_bridged_channel(sub->owner)) { - ast_moh_start(ast_bridged_channel(sub->owner), NULL); - } - sub->next->cxmode = MGCP_CX_RECVONLY; - handle_hd_hf(sub->next, ev); - } else if (sub->owner && sub->next->owner) { - /* We've got two active calls lets decide whether or not to conference or just flip flop */ - if ((!sub->outgoing) && (!sub->next->outgoing)) { - /* We made both calls lets conferenct */ - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "MGCP Conferencing %d and %d on %s@%s\n", - sub->id, sub->next->id, p->name, p->parent->name); - } - sub->cxmode = MGCP_CX_CONF; - sub->next->cxmode = MGCP_CX_CONF; - if (ast_bridged_channel(sub->next->owner)) - ast_moh_stop(ast_bridged_channel(sub->next->owner)); - transmit_modify_request(sub); - transmit_modify_request(sub->next); - } else { - /* Let's flipflop between calls */ - /* XXX Need to check for state up ??? */ - /* XXX Need a way to indicate the current call, or maybe the call that's waiting */ - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "We didn't make one of the calls FLIPFLOP %d and %d on %s@%s\n", - sub->id, sub->next->id, p->name, p->parent->name); - } - sub->cxmode = MGCP_CX_MUTE; - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "MGCP Muting %d on %s@%s\n", sub->id, p->name, p->parent->name); - } - transmit_modify_request(sub); - if (ast_bridged_channel(sub->owner)) - ast_moh_start(ast_bridged_channel(sub->owner), NULL); + /* We can assume we are offhook if we received a hookflash */ + /* First let's just do call wait and ignore threeway */ + /* We're currently in charge */ + if (p->hookstate != MGCP_OFFHOOK) { + /* Cisco c7940 sends hf even if the phone is onhook */ + /* Thanks to point on IRC for pointing this out */ + return -1; + } + /* do not let * conference two down channels */ + if (sub->owner && sub->owner->_state == AST_STATE_DOWN && !sub->next->owner) + return -1; + + if (p->callwaiting || p->transfer || p->threewaycalling) { + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "Swapping %d for %d on %s@%s\n", p->sub->id, p->sub->next->id, p->name, p->parent->name); + } + p->sub = p->sub->next; + + /* transfer control to our next subchannel */ + if (!sub->next->owner) { + /* plave the first call on hold and start up a new call */ + sub->cxmode = MGCP_CX_MUTE; + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "MGCP Muting %d on %s@%s\n", sub->id, p->name, p->parent->name); + } + transmit_modify_request(sub); + if (sub->owner && ast_bridged_channel(sub->owner)) { + ast_moh_start(ast_bridged_channel(sub->owner), NULL); + } + sub->next->cxmode = MGCP_CX_RECVONLY; + handle_hd_hf(sub->next, ev); + } else if (sub->owner && sub->next->owner) { + /* We've got two active calls lets decide whether or not to conference or just flip flop */ + if ((!sub->outgoing) && (!sub->next->outgoing)) { + /* We made both calls lets conferenct */ + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "MGCP Conferencing %d and %d on %s@%s\n", + sub->id, sub->next->id, p->name, p->parent->name); + } + sub->cxmode = MGCP_CX_CONF; + sub->next->cxmode = MGCP_CX_CONF; + if (ast_bridged_channel(sub->next->owner)) + ast_moh_stop(ast_bridged_channel(sub->next->owner)); + transmit_modify_request(sub); + transmit_modify_request(sub->next); + } else { + /* Let's flipflop between calls */ + /* XXX Need to check for state up ??? */ + /* XXX Need a way to indicate the current call, or maybe the call that's waiting */ + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "We didn't make one of the calls FLIPFLOP %d and %d on %s@%s\n", + sub->id, sub->next->id, p->name, p->parent->name); + } + sub->cxmode = MGCP_CX_MUTE; + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "MGCP Muting %d on %s@%s\n", sub->id, p->name, p->parent->name); + } + transmit_modify_request(sub); + if (ast_bridged_channel(sub->owner)) + ast_moh_start(ast_bridged_channel(sub->owner), NULL); - if (ast_bridged_channel(sub->next->owner)) - ast_moh_stop(ast_bridged_channel(sub->next->owner)); + if (ast_bridged_channel(sub->next->owner)) + ast_moh_stop(ast_bridged_channel(sub->next->owner)); - handle_hd_hf(sub->next, ev); + handle_hd_hf(sub->next, ev); #if 0 - if (sub->next->owner && (sub->next->owner->_state != AST_STATE_UP)) { - handle_hd_hf(sub->next, ev); - } else { - ast_verbose(VERBOSE_PREFIX_3 "MGCP Unmuting %d on %s@%s\n", sub->next->id, p->name, p->parent->name); - sub->next->cxmode = MGCP_CX_SENDRECV; - transmit_modify_request(sub->next); - } + if (sub->next->owner && (sub->next->owner->_state != AST_STATE_UP)) { + handle_hd_hf(sub->next, ev); + } else { + ast_verbose(VERBOSE_PREFIX_3 "MGCP Unmuting %d on %s@%s\n", sub->next->id, p->name, p->parent->name); + sub->next->cxmode = MGCP_CX_SENDRECV; + transmit_modify_request(sub->next); + } #endif - } - } else { - /* We've most likely lost one of our calls find an active call and bring it up */ - if (sub->owner) { - p->sub = sub; - } else if (sub->next->owner) { - p->sub = sub->next; - } else { - /* We seem to have lost both our calls */ - /* XXX - What do we do now? */ - return -1; - } - if (ast_bridged_channel(p->sub->owner)) { - ast_moh_stop(ast_bridged_channel(p->sub->owner)); - } - p->sub->cxmode = MGCP_CX_SENDRECV; - transmit_modify_request(p->sub); - } - } else { - ast_log(LOG_WARNING, "Callwaiting, call transfer or threeway calling not enabled on endpoint %s@%s\n", - p->name, p->parent->name); - } - /* ast_moh_stop(sub->owner->bridge); */ + } + } else { + /* We've most likely lost one of our calls find an active call and bring it up */ + if (sub->owner) { + p->sub = sub; + } else if (sub->next->owner) { + p->sub = sub->next; + } else { + /* We seem to have lost both our calls */ + /* XXX - What do we do now? */ + return -1; + } + if (ast_bridged_channel(p->sub->owner)) { + ast_moh_stop(ast_bridged_channel(p->sub->owner)); + } + p->sub->cxmode = MGCP_CX_SENDRECV; + transmit_modify_request(p->sub); + } + } else { + ast_log(LOG_WARNING, "Callwaiting, call transfer or threeway calling not enabled on endpoint %s@%s\n", + p->name, p->parent->name); + } + /*ast_moh_stop(sub->owner->bridge);*/ } else if (!strcasecmp(ev, "hu")) { - p->hookstate = MGCP_ONHOOK; - sub->cxmode = MGCP_CX_RECVONLY; - ast_log(LOG_DEBUG, "MGCP %s@%s Went on hook\n", p->name, p->parent->name); - /* JS: Do we need to send MDCX before a DLCX ? - if (sub->rtp) { - transmit_modify_request(sub); - } - */ - if (p->transfer && (sub->owner && sub->next->owner) && ((!sub->outgoing) || (!sub->next->outgoing))) { - /* We're allowed to transfer, we have two avtive calls and */ - /* we made at least one of the calls. Let's try and transfer */ + p->hookstate = MGCP_ONHOOK; + sub->cxmode = MGCP_CX_RECVONLY; + ast_log(LOG_DEBUG, "MGCP %s@%s Went on hook\n", p->name, p->parent->name); + /* JS: Do we need to send MDCX before a DLCX ? + if (sub->rtp) { + transmit_modify_request(sub); + } + */ + if (p->transfer && (sub->owner && sub->next->owner) && ((!sub->outgoing) || (!sub->next->outgoing))) { + /* We're allowed to transfer, we have two avtive calls and */ + /* we made at least one of the calls. Let's try and transfer */ ast_mutex_lock(&p->sub->next->lock); res = attempt_transfer(p); - if (res < 0) { - if (p->sub->next->owner) { - sub->next->alreadygone = 1; - mgcp_queue_hangup(sub->next); - } - } else if (res) { - ast_log(LOG_WARNING, "Transfer attempt failed\n"); + if (res < 0) { + if (p->sub->next->owner) { + sub->next->alreadygone = 1; + mgcp_queue_hangup(sub->next); + } + } else if (res) { + ast_log(LOG_WARNING, "Transfer attempt failed\n"); ast_mutex_unlock(&p->sub->next->lock); - return -1; - } + return -1; + } ast_mutex_unlock(&p->sub->next->lock); - } else { - /* Hangup the current call */ - /* If there is another active call, mgcp_hangup will ring the phone with the other call */ - if (sub->owner) { - sub->alreadygone = 1; - mgcp_queue_hangup(sub); - } else { - /* SC: verbose level check */ - if (option_verbose > 2) { + } else { + /* Hangup the current call */ + /* If there is another active call, mgcp_hangup will ring the phone with the other call */ + if (sub->owner) { + sub->alreadygone = 1; + mgcp_queue_hangup(sub); + } else { + /* SC: verbose level check */ + if (option_verbose > 2) { if (option_verbose > 2) { ast_verbose(VERBOSE_PREFIX_3 "MGCP handle_request(%s@%s-%d) ast_channel already destroyed, resending DLCX.\n", p->name, p->parent->name, sub->id); @@ -3119,46 +3130,44 @@ * still thinks the channel is active. * * For Cisco IAD2421 /BAK/ */ transmit_connection_del(sub); - } - } - } - if ((p->hookstate == MGCP_ONHOOK) && (!sub->rtp) && (!sub->next->rtp)) { - if (has_voicemail(p)) { - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "MGCP handle_request(%s@%s) set vmwi(+)\n", p->name, p->parent->name); - } - transmit_notify_request(sub, "L/vmwi(+)"); - } else { - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "MGCP handle_request(%s@%s) set vmwi(-)\n", p->name, p->parent->name); - } - transmit_notify_request(sub, "L/vmwi(-)"); - } - } + } + } + } + if ((p->hookstate == MGCP_ONHOOK) && (!sub->rtp) && (!sub->next->rtp)) { + if (has_voicemail(p)) { + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "MGCP handle_request(%s@%s) set vmwi(+)\n", p->name, p->parent->name); + } + transmit_notify_request(sub, "L/vmwi(+)"); + } else { + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "MGCP handle_request(%s@%s) set vmwi(-)\n", p->name, p->parent->name); + } + transmit_notify_request(sub, "L/vmwi(-)"); + } + } } else if ((strlen(ev) == 1) && - (((ev[0] >= '0') && (ev[0] <= '9')) || - ((ev[0] >= 'A') && (ev[0] <= 'D')) || - (ev[0] == '*') || (ev[0] == '#'))) { + (((ev[0] >= '0') && (ev[0] <= '9')) || + ((ev[0] >= 'A') && (ev[0] <= 'D')) || + (ev[0] == '*') || (ev[0] == '#'))) { f.frametype = AST_FRAME_DTMF; f.subclass = ev[0]; f.src = "mgcp"; if (sub->owner) { - /* XXX MUST queue this frame to all subs in threeway call if threeway call is active */ + /* XXX MUST queue this frame to all subs in threeway call if threeway call is active */ mgcp_queue_frame(sub, &f); ast_mutex_lock(&sub->next->lock); - if (sub->next->owner) { - mgcp_queue_frame(sub->next, &f); - } + if (sub->next->owner) { + mgcp_queue_frame(sub->next, &f); + } ast_mutex_unlock(&sub->next->lock); - } - if (strstr(p->curtone, "wt") && (ev[0] == 'A')) { - memset(p->curtone, 0, sizeof(p->curtone)); - } - } - else if (!strcasecmp(ev, "T")) { + } + if (strstr(p->curtone, "wt") && (ev[0] == 'A')) { + memset(p->curtone, 0, sizeof(p->curtone)); + } + } else if (!strcasecmp(ev, "T")) { /* Digit timeout -- unimportant */ - } - else if (!strcasecmp(ev, "ping")) { + } else if (!strcasecmp(ev, "ping")) { /* ping -- unimportant */ } else { ast_log(LOG_NOTICE, "Received unknown event '%s' from %s@%s\n", ev, p->name, p->parent->name); @@ -3224,7 +3233,7 @@ req.len = res; if (mgcpdebug) { ast_verbose("MGCP read: \n%s\nfrom %s:%d\n", req.data, ast_inet_ntoa(iabuf, sizeof(iabuf), sin.sin_addr), ntohs(sin.sin_port)); - } + } parse(&req); if (req.headers < 1) { /* Must have at least one header */ @@ -3235,42 +3244,41 @@ return 1; } - if (sscanf(req.verb, "%d", &result) && - sscanf(req.identifier, "%d", &ident)) { + if (sscanf(req.verb, "%d", &result) && sscanf(req.identifier, "%d", &ident)) { /* Try to find who this message is for, if it's important */ sub = find_subchannel_and_lock(NULL, ident, &sin); if (sub) { - struct mgcp_gateway *gw = sub->parent->parent; - struct mgcp_message *cur, *prev; + struct mgcp_gateway *gw = sub->parent->parent; + struct mgcp_message *cur, *prev; ast_mutex_unlock(&sub->lock); - ast_mutex_lock(&gw->msgs_lock); - for (prev = NULL, cur = gw->msgs; cur; prev = cur, cur = cur->next) { - if (cur->seqno == ident) { - ast_log(LOG_DEBUG, "Got response back on transaction %d\n", ident); - if (prev) - prev->next = cur->next; - else - gw->msgs = cur->next; - break; - } - } - - /* stop retrans timer if the queue is empty */ - if (!gw->msgs && (gw->retransid != -1)) { - ast_sched_del(sched, gw->retransid); - gw->retransid = -1; - } - - ast_mutex_unlock(&gw->msgs_lock); - if (cur) { - handle_response(cur->owner_ep, cur->owner_sub, result, ident, &req); - free(cur); - return 1; - } + ast_mutex_lock(&gw->msgs_lock); + for (prev = NULL, cur = gw->msgs; cur; prev = cur, cur = cur->next) { + if (cur->seqno == ident) { + ast_log(LOG_DEBUG, "Got response back on transaction %d\n", ident); + if (prev) + prev->next = cur->next; + else + gw->msgs = cur->next; + break; + } + } + + /* stop retrans timer if the queue is empty */ + if (!gw->msgs && (gw->retransid != -1)) { + ast_sched_del(sched, gw->retransid); + gw->retransid = -1; + } + + ast_mutex_unlock(&gw->msgs_lock); + if (cur) { + handle_response(cur->owner_ep, cur->owner_sub, result, ident, &req); + free(cur); + return 1; + } - ast_log(LOG_NOTICE, "Got response back on [%s] for transaction %d we aren't sending?\n", - gw->name, ident); + ast_log(LOG_NOTICE, "Got response back on [%s] for transaction %d we aren't sending?\n", + gw->name, ident); } } else { if (!req.endpoint || !strlen(req.endpoint) || @@ -3284,7 +3292,7 @@ if (sub) { /* look first to find a matching response in the queue */ if (!find_and_retrans(sub, &req)) - /* pass the request off to the currently mastering subchannel */ + /* pass the request off to the currently mastering subchannel */ handle_request(sub, &req, &sin); ast_mutex_unlock(&sub->lock); } @@ -3298,8 +3306,8 @@ { int res; int reloading; - /* struct mgcp_gateway *g; */ - /* struct mgcp_endpoint *e; */ + /*struct mgcp_gateway *g;*/ + /*struct mgcp_endpoint *e;*/ /*time_t thispass = 0, lastpass = 0;*/ /* Add an I/O event to our UDP socket */ @@ -3310,7 +3318,7 @@ (and thus do not have a separate thread) indefinitely */ /* From here on out, we die whenever asked */ for(;;) { - /* Check for a reload request */ + /* Check for a reload request */ ast_mutex_lock(&mgcp_reload_lock); reloading = mgcp_reloading; mgcp_reloading = 0; @@ -3324,43 +3332,42 @@ mgcpsock_read_id = ast_io_add(io, mgcpsock, mgcpsock_read, AST_IO_IN, NULL); } - /* Check for interfaces needing to be killed */ + /* Check for interfaces needing to be killed */ /* Don't let anybody kill us right away. Nobody should lock the interface list and wait for the monitor list, but the other way around is okay. */ ast_mutex_lock(&monlock); /* Lock the network interface */ ast_mutex_lock(&netlock); - /* XXX THIS IS COMPLETELY HOSED */ - /* The gateway goes into a state of panic */ - /* If the vmwi indicator is sent while it is reseting interfaces */ #if 0 - lastpass = thispass; - thispass = time(NULL); - g = gateways; - while(g) { - if (thispass != lastpass) { - e = g->endpoints; - while(e) { - if (e->type == TYPE_LINE) { - res = has_voicemail(e); - if ((e->msgstate != res) && (e->hookstate == MGCP_ONHOOK) && (!e->rtp)){ - if (res) { - transmit_notify_request(e, "L/vmwi(+)"); - } else { - transmit_notify_request(e, "L/vmwi(-)"); - } - e->msgstate = res; - e->onhooktime = thispass; - } - } - e = e->next; - } - } - g = g->next; - } + /* XXX THIS IS COMPLETELY HOSED */ + /* The gateway goes into a state of panic */ + /* If the vmwi indicator is sent while it is reseting interfaces */ + lastpass = thispass; + thispass = time(NULL); + g = gateways; + while(g) { + if (thispass != lastpass) { + e = g->endpoints; + while(e) { + if (e->type == TYPE_LINE) { + res = has_voicemail(e); + if ((e->msgstate != res) && (e->hookstate == MGCP_ONHOOK) && (!e->rtp)){ + if (res) { + transmit_notify_request(e, "L/vmwi(+)"); + } else { + transmit_notify_request(e, "L/vmwi(-)"); + } + e->msgstate = res; + e->onhooktime = thispass; + } + } + e = e->next; + } + } + g = g->next; + } #endif - /* Okay, now that we know what to do, release the network lock */ ast_mutex_unlock(&netlock); /* And from now on, we're okay to be killed, so release the monitor lock as well */ @@ -3368,7 +3375,7 @@ pthread_testcancel(); /* Wait for sched or io */ res = ast_sched_wait(sched); - /* SC: copied from chan_sip.c */ + /* SC: copied from chan_sip.c */ if ((res < 0) || (res > 1000)) res = 1000; res = ast_io_wait(io, res); @@ -3379,7 +3386,6 @@ } /* Never reached */ return NULL; - } static int restart_monitor(void) @@ -3441,26 +3447,26 @@ return NULL; } - if (option_verbose > 2) { - ast_verbose(VERBOSE_PREFIX_3 "MGCP mgcp_request(%s)\n", tmp); - ast_verbose(VERBOSE_PREFIX_3 "MGCP cw: %d, dnd: %d, so: %d, sno: %d\n", - sub->parent->callwaiting, sub->parent->dnd, sub->owner ? 1 : 0, sub->next->owner ? 1: 0); - } + if (option_verbose > 2) { + ast_verbose(VERBOSE_PREFIX_3 "MGCP mgcp_request(%s)\n", tmp); + ast_verbose(VERBOSE_PREFIX_3 "MGCP cw: %d, dnd: %d, so: %d, sno: %d\n", + sub->parent->callwaiting, sub->parent->dnd, sub->owner ? 1 : 0, sub->next->owner ? 1: 0); + } /* Must be busy */ if (((sub->parent->callwaiting) && ((sub->owner) && (sub->next->owner))) || - ((!sub->parent->callwaiting) && (sub->owner)) || - (sub->parent->dnd && (!strlen(sub->parent->call_forward)))) { - if (sub->parent->hookstate == MGCP_ONHOOK) { - if (has_voicemail(sub->parent)) { - transmit_notify_request(sub,"L/vmwi(+)"); - } else { - transmit_notify_request(sub,"L/vmwi(-)"); - } - } + ((!sub->parent->callwaiting) && (sub->owner)) || + (sub->parent->dnd && (!strlen(sub->parent->call_forward)))) { + if (sub->parent->hookstate == MGCP_ONHOOK) { + if (has_voicemail(sub->parent)) { + transmit_notify_request(sub,"L/vmwi(+)"); + } else { + transmit_notify_request(sub,"L/vmwi(-)"); + } + } *cause = AST_CAUSE_BUSY; ast_mutex_unlock(&sub->lock); return NULL; - } + } tmpc = mgcp_new(sub->owner ? sub->next : sub, AST_STATE_DOWN); ast_mutex_unlock(&sub->lock); if (!tmpc) @@ -3474,39 +3480,39 @@ { struct mgcp_gateway *gw; struct mgcp_endpoint *e; - struct mgcp_subchannel *sub; - /*char txident[80];*/ - int i=0, y=0; - int gw_reload = 0; - int ep_reload = 0; + struct mgcp_subchannel *sub; + /*char txident[80];*/ + int i=0, y=0; + int gw_reload = 0; + int ep_reload = 0; canreinvite = CANREINVITE; - /* SC: locate existing gateway */ - gw = gateways; - while (gw) { - if (!strcasecmp(cat, gw->name)) { - /* gateway already exists */ - gw->delme = 0; - gw_reload = 1; - break; - } - gw = gw->next; - } + /* SC: locate existing gateway */ + gw = gateways; + while (gw) { + if (!strcasecmp(cat, gw->name)) { + /* gateway already exists */ + gw->delme = 0; + gw_reload = 1; + break; + } + gw = gw->next; + } - if (!gw) - gw = malloc(sizeof(struct mgcp_gateway)); + if (!gw) + gw = malloc(sizeof(struct mgcp_gateway)); if (gw) { - if (!gw_reload) { - memset(gw, 0, sizeof(struct mgcp_gateway)); - gw->expire = -1; - gw->retransid = -1; /* SC */ - ast_mutex_init(&gw->msgs_lock); - strncpy(gw->name, cat, sizeof(gw->name) - 1); - /* SC: check if the name is numeric ip */ - if ((strchr(gw->name, '.')) && inet_addr(gw->name) != INADDR_NONE) - gw->isnamedottedip = 1; - } + if (!gw_reload) { + memset(gw, 0, sizeof(struct mgcp_gateway)); + gw->expire = -1; + gw->retransid = -1; /* SC */ + ast_mutex_init(&gw->msgs_lock); + strncpy(gw->name, cat, sizeof(gw->name) - 1); + /* SC: check if the name is numeric ip */ + if ((strchr(gw->name, '.')) && inet_addr(gw->name) != INADDR_NONE) + gw->isnamedottedip = 1; + } while(v) { if (!strcasecmp(v->name, "host")) { if (!strcasecmp(v->value, "dynamic")) { @@ -3525,23 +3531,23 @@ gw->expire = -1; gw->dynamic = 0; if (ast_get_ip(&gw->addr, v->value)) { - if (!gw_reload) { - ast_mutex_destroy(&gw->msgs_lock); - free(gw); + if (!gw_reload) { + ast_mutex_destroy(&gw->msgs_lock); + free(gw); } return NULL; } } } else if (!strcasecmp(v->name, "defaultip")) { if (ast_get_ip(&gw->defaddr, v->value)) { - if (!gw_reload) { - ast_mutex_destroy(&gw->msgs_lock); - free(gw); - } + if (!gw_reload) { + ast_mutex_destroy(&gw->msgs_lock); + free(gw); + } return NULL; } } else if (!strcasecmp(v->name, "permit") || - !strcasecmp(v->name, "deny")) { + !strcasecmp(v->name, "deny")) { gw->ha = ast_append_ha(v->name, v->value, gw->ha); } else if (!strcasecmp(v->name, "port")) { gw->addr.sin_port = htons(atoi(v->value)); @@ -3567,103 +3573,103 @@ } } else if (!strcasecmp(v->name, "language")) { strncpy(language, v->value, sizeof(language)-1); - } else if (!strcasecmp(v->name, "accountcode")) { - strncpy(accountcode, v->value, sizeof(accountcode)-1); - } else if (!strcasecmp(v->name, "amaflags")) { - y = ast_cdr_amaflags2int(v->value); - if (y < 0) { - ast_log(LOG_WARNING, "Invalid AMA flags: %s at line %d\n", v->value, v->lineno); - } else { - amaflags = y; - } - } else if (!strcasecmp(v->name, "musiconhold")) { - strncpy(musicclass, v->value, sizeof(musicclass)-1); - } else if (!strcasecmp(v->name, "callgroup")) { - cur_callergroup = ast_get_group(v->value); - } else if (!strcasecmp(v->name, "pickupgroup")) { - cur_pickupgroup = ast_get_group(v->value); - } else if (!strcasecmp(v->name, "immediate")) { - immediate = ast_true(v->value); - } else if (!strcasecmp(v->name, "cancallforward")) { - cancallforward = ast_true(v->value); - } else if (!strcasecmp(v->name, "singlepath")) { - singlepath = ast_true(v->value); - } else if (!strcasecmp(v->name, "canreinvite")) { - canreinvite = ast_true(v->value); - } else if (!strcasecmp(v->name, "mailbox")) { - strncpy(mailbox, v->value, sizeof(mailbox) -1); - } else if (!strcasecmp(v->name, "adsi")) { - adsi = ast_true(v->value); - } else if (!strcasecmp(v->name, "callreturn")) { - callreturn = ast_true(v->value); - } else if (!strcasecmp(v->name, "callwaiting")) { - callwaiting = ast_true(v->value); - } else if (!strcasecmp(v->name, "slowsequence")) { - slowsequence = ast_true(v->value); - } else if (!strcasecmp(v->name, "transfer")) { - transfer = ast_true(v->value); - } else if (!strcasecmp(v->name, "threewaycalling")) { - threewaycalling = ast_true(v->value); + } else if (!strcasecmp(v->name, "accountcode")) { + strncpy(accountcode, v->value, sizeof(accountcode)-1); + } else if (!strcasecmp(v->name, "amaflags")) { + y = ast_cdr_amaflags2int(v->value); + if (y < 0) { + ast_log(LOG_WARNING, "Invalid AMA flags: %s at line %d\n", v->value, v->lineno); + } else { + amaflags = y; + } + } else if (!strcasecmp(v->name, "musiconhold")) { + strncpy(musicclass, v->value, sizeof(musicclass)-1); + } else if (!strcasecmp(v->name, "callgroup")) { + cur_callergroup = ast_get_group(v->value); + } else if (!strcasecmp(v->name, "pickupgroup")) { + cur_pickupgroup = ast_get_group(v->value); + } else if (!strcasecmp(v->name, "immediate")) { + immediate = ast_true(v->value); + } else if (!strcasecmp(v->name, "cancallforward")) { + cancallforward = ast_true(v->value); + } else if (!strcasecmp(v->name, "singlepath")) { + singlepath = ast_true(v->value); + } else if (!strcasecmp(v->name, "canreinvite")) { + canreinvite = ast_true(v->value); + } else if (!strcasecmp(v->name, "mailbox")) { + strncpy(mailbox, v->value, sizeof(mailbox) -1); + } else if (!strcasecmp(v->name, "adsi")) { + adsi = ast_true(v->value); + } else if (!strcasecmp(v->name, "callreturn")) { + callreturn = ast_true(v->value); + } else if (!strcasecmp(v->name, "callwaiting")) { + callwaiting = ast_true(v->value); + } else if (!strcasecmp(v->name, "slowsequence")) { + slowsequence = ast_true(v->value); + } else if (!strcasecmp(v->name, "transfer")) { + transfer = ast_true(v->value); + } else if (!strcasecmp(v->name, "threewaycalling")) { + threewaycalling = ast_true(v->value); } else if (!strcasecmp(v->name, "wcardep")) { /* SC: locate existing endpoint */ - e = gw->endpoints; - while (e) { - if (!strcasecmp(v->value, e->name)) { - /* endpoint already exists */ - e->delme = 0; - ep_reload = 1; - break; - } - e = e->next; - } - - if (!e) { - /* Allocate wildcard endpoint */ - e = malloc(sizeof(struct mgcp_endpoint)); - ep_reload = 0; - } + e = gw->endpoints; + while (e) { + if (!strcasecmp(v->value, e->name)) { + /* endpoint already exists */ + e->delme = 0; + ep_reload = 1; + break; + } + e = e->next; + } + + if (!e) { + /* Allocate wildcard endpoint */ + e = malloc(sizeof(struct mgcp_endpoint)); + ep_reload = 0; + } if (e) { if (!ep_reload) { - memset(e, 0, sizeof(struct mgcp_endpoint)); - ast_mutex_init(&e->lock); - ast_mutex_init(&e->rqnt_queue_lock); - ast_mutex_init(&e->cmd_queue_lock); - strncpy(e->name, v->value, sizeof(e->name) - 1); - e->needaudit = 1; - } - strncpy(gw->wcardep, v->value, sizeof(gw->wcardep)-1); - /*strncpy(e->name, "aaln/" "*", sizeof(e->name) - 1); */ + memset(e, 0, sizeof(struct mgcp_endpoint)); + ast_mutex_init(&e->lock); + ast_mutex_init(&e->rqnt_queue_lock); + ast_mutex_init(&e->cmd_queue_lock); + strncpy(e->name, v->value, sizeof(e->name) - 1); + e->needaudit = 1; + } + strncpy(gw->wcardep, v->value, sizeof(gw->wcardep)-1); + /*strncpy(e->name, "aaln/" "*", sizeof(e->name) - 1);*/ /* XXX Should we really check for uniqueness?? XXX */ strncpy(e->context, context, sizeof(e->context) - 1); strncpy(e->cid_num, cid_num, sizeof(e->cid_num) - 1); strncpy(e->cid_name, cid_name, sizeof(e->cid_name) - 1); strncpy(e->language, language, sizeof(e->language) - 1); - strncpy(e->musicclass, musicclass, sizeof(e->musicclass)-1); - strncpy(e->mailbox, mailbox, sizeof(e->mailbox)-1); + strncpy(e->musicclass, musicclass, sizeof(e->musicclass)-1); + strncpy(e->mailbox, mailbox, sizeof(e->mailbox)-1); snprintf(e->rqnt_ident, sizeof(e->rqnt_ident), "%08x", rand()); - e->msgstate = -1; + e->msgstate = -1; e->capability = capability; e->parent = gw; e->dtmfmode = dtmfmode; e->adsi = adsi; e->type = TYPE_LINE; - e->immediate = immediate; - e->callgroup=cur_callergroup; - e->pickupgroup=cur_pickupgroup; - e->callreturn = callreturn; - e->cancallforward = cancallforward; - e->singlepath = singlepath; - e->canreinvite = canreinvite; - e->callwaiting = callwaiting; - e->slowsequence = slowsequence; - e->transfer = transfer; - e->threewaycalling = threewaycalling; - e->onhooktime = time(NULL); - /* ASSUME we're onhook */ - e->hookstate = MGCP_ONHOOK; + e->immediate = immediate; + e->callgroup=cur_callergroup; + e->pickupgroup=cur_pickupgroup; + e->callreturn = callreturn; + e->cancallforward = cancallforward; + e->singlepath = singlepath; + e->canreinvite = canreinvite; + e->callwaiting = callwaiting; + e->slowsequence = slowsequence; + e->transfer = transfer; + e->threewaycalling = threewaycalling; + e->onhooktime = time(NULL); + /* ASSUME we're onhook */ + e->hookstate = MGCP_ONHOOK; if (!ep_reload) { - /*snprintf(txident, sizeof(txident), "%08x", rand());*/ + /*snprintf(txident, sizeof(txident), "%08x", rand());*/ for (i = 0; i < MAX_SUBS; i++) { sub = malloc(sizeof(struct mgcp_subchannel)); if (sub) { @@ -3701,47 +3707,47 @@ } else if (!strcasecmp(v->name, "trunk") || !strcasecmp(v->name, "line")) { - /* SC: locate existing endpoint */ - e = gw->endpoints; - while (e) { - if (!strcasecmp(v->value, e->name)) { - /* endpoint already exists */ - e->delme = 0; - ep_reload = 1; - break; - } - e = e->next; - } - - if (!e) { - e = malloc(sizeof(struct mgcp_endpoint)); - ep_reload = 0; - } + /* SC: locate existing endpoint */ + e = gw->endpoints; + while (e) { + if (!strcasecmp(v->value, e->name)) { + /* endpoint already exists */ + e->delme = 0; + ep_reload = 1; + break; + } + e = e->next; + } + + if (!e) { + e = malloc(sizeof(struct mgcp_endpoint)); + ep_reload = 0; + } if (e) { - if (!ep_reload) { - memset(e, 0, sizeof(struct mgcp_endpoint)); - ast_mutex_init(&e->lock); - ast_mutex_init(&e->rqnt_queue_lock); - ast_mutex_init(&e->cmd_queue_lock); - strncpy(e->name, v->value, sizeof(e->name) - 1); - e->needaudit = 1; - } + if (!ep_reload) { + memset(e, 0, sizeof(struct mgcp_endpoint)); + ast_mutex_init(&e->lock); + ast_mutex_init(&e->rqnt_queue_lock); + ast_mutex_init(&e->cmd_queue_lock); + strncpy(e->name, v->value, sizeof(e->name) - 1); + e->needaudit = 1; + } /* XXX Should we really check for uniqueness?? XXX */ strncpy(e->context, context, sizeof(e->context) - 1); strncpy(e->cid_num, cid_num, sizeof(e->cid_num) - 1); strncpy(e->cid_name, cid_name, sizeof(e->cid_name) - 1); strncpy(e->language, language, sizeof(e->language) - 1); - strncpy(e->musicclass, musicclass, sizeof(e->musicclass)-1); - strncpy(e->mailbox, mailbox, sizeof(e->mailbox)-1); - if (strlen(mailbox)) { - ast_verbose(VERBOSE_PREFIX_3 "Setting mailbox '%s' on %s@%s\n", mailbox, gw->name, e->name); - } - if (!ep_reload) { - /* XXX SC: potential issue due to reload */ - e->msgstate = -1; - e->parent = gw; - } + strncpy(e->musicclass, musicclass, sizeof(e->musicclass)-1); + strncpy(e->mailbox, mailbox, sizeof(e->mailbox)-1); + if (strlen(mailbox)) { + ast_verbose(VERBOSE_PREFIX_3 "Setting mailbox '%s' on %s@%s\n", mailbox, gw->name, e->name); + } + if (!ep_reload) { + /* XXX SC: potential issue due to reload */ + e->msgstate = -1; + e->parent = gw; + } e->capability = capability; e->dtmfmode = dtmfmode; e->adsi = adsi; @@ -3750,81 +3756,79 @@ else e->type = TYPE_LINE; - e->immediate = immediate; - e->callgroup=cur_callergroup; - e->pickupgroup=cur_pickupgroup; - e->callreturn = callreturn; - e->cancallforward = cancallforward; - e->canreinvite = canreinvite; - e->singlepath = singlepath; - e->callwaiting = callwaiting; - e->slowsequence = slowsequence; - e->transfer = transfer; - e->threewaycalling = threewaycalling; - if (!ep_reload) { - e->onhooktime = time(NULL); - /* ASSUME we're onhook */ - e->hookstate = MGCP_ONHOOK; - snprintf(e->rqnt_ident, sizeof(e->rqnt_ident), "%08x", rand()); - } - - for (i = 0, sub = NULL; i < MAX_SUBS; i++) { - if (!ep_reload) { - sub = malloc(sizeof(struct mgcp_subchannel)); - } - else { - if (!sub) - sub = e->sub; - else - sub = sub->next; - } - - if (sub) { - if (!ep_reload) { - ast_verbose(VERBOSE_PREFIX_3 "Allocating subchannel '%d' on %s@%s\n", i, e->name, gw->name); - memset(sub, 0, sizeof(struct mgcp_subchannel)); - ast_mutex_init(&sub->lock); - ast_mutex_init(&sub->cx_queue_lock); - strncpy(sub->magic, MGCP_SUBCHANNEL_MAGIC, sizeof(sub->magic) - 1); - sub->parent = e; - sub->id = i; - snprintf(sub->txident, sizeof(sub->txident), "%08x", rand()); - sub->cxmode = MGCP_CX_INACTIVE; - sub->next = e->sub; - e->sub = sub; - } - sub->nat = nat; - } else { - /* XXX Should find a way to clean up our memory */ - ast_log(LOG_WARNING, "Out of memory allocating subchannel"); - return NULL; - } - } - if (!ep_reload) { - /* Make out subs a circular linked list so we can always sping through the whole bunch */ - sub = e->sub; - /* find the end of the list */ - while(sub->next){ - sub = sub->next; - } - /* set the last sub->next to the first sub */ - sub->next = e->sub; - - e->next = gw->endpoints; - gw->endpoints = e; - } + e->immediate = immediate; + e->callgroup=cur_callergroup; + e->pickupgroup=cur_pickupgroup; + e->callreturn = callreturn; + e->cancallforward = cancallforward; + e->canreinvite = canreinvite; + e->singlepath = singlepath; + e->callwaiting = callwaiting; + e->slowsequence = slowsequence; + e->transfer = transfer; + e->threewaycalling = threewaycalling; + if (!ep_reload) { + e->onhooktime = time(NULL); + /* ASSUME we're onhook */ + e->hookstate = MGCP_ONHOOK; + snprintf(e->rqnt_ident, sizeof(e->rqnt_ident), "%08x", rand()); + } + + for (i = 0, sub = NULL; i < MAX_SUBS; i++) { + if (!ep_reload) { + sub = malloc(sizeof(struct mgcp_subchannel)); + } else { + if (!sub) + sub = e->sub; + else + sub = sub->next; + } + + if (sub) { + if (!ep_reload) { + ast_verbose(VERBOSE_PREFIX_3 "Allocating subchannel '%d' on %s@%s\n", i, e->name, gw->name); + memset(sub, 0, sizeof(struct mgcp_subchannel)); + ast_mutex_init(&sub->lock); + ast_mutex_init(&sub->cx_queue_lock); + strncpy(sub->magic, MGCP_SUBCHANNEL_MAGIC, sizeof(sub->magic) - 1); + sub->parent = e; + sub->id = i; + snprintf(sub->txident, sizeof(sub->txident), "%08x", rand()); + sub->cxmode = MGCP_CX_INACTIVE; + sub->next = e->sub; + e->sub = sub; + } + sub->nat = nat; + } else { + /* XXX Should find a way to clean up our memory */ + ast_log(LOG_WARNING, "Out of memory allocating subchannel"); + return NULL; + } + } + if (!ep_reload) { + /* Make out subs a circular linked list so we can always sping through the whole bunch */ + sub = e->sub; + /* find the end of the list */ + while (sub->next) { + sub = sub->next; + } + /* set the last sub->next to the first sub */ + sub->next = e->sub; + + e->next = gw->endpoints; + gw->endpoints = e; + } } } else ast_log(LOG_WARNING, "Don't know keyword '%s' at line %d\n", v->name, v->lineno); v = v->next; } - } if (!ntohl(gw->addr.sin_addr.s_addr) && !gw->dynamic) { ast_log(LOG_WARNING, "Gateway '%s' lacks IP address and isn't dynamic\n", gw->name); - if (!gw_reload) { - ast_mutex_destroy(&gw->msgs_lock); - free(gw); + if (!gw_reload) { + ast_mutex_destroy(&gw->msgs_lock); + free(gw); } return NULL; } @@ -3907,99 +3911,97 @@ static void destroy_endpoint(struct mgcp_endpoint *e) { - struct mgcp_subchannel *sub = e->sub->next, *s; - int i; + struct mgcp_subchannel *sub = e->sub->next, *s; + int i; + + for (i = 0; i < MAX_SUBS; i++) { + ast_mutex_lock(&sub->lock); + if (strlen(sub->cxident)) { + transmit_connection_del(sub); + } + if (sub->rtp) { + ast_rtp_destroy(sub->rtp); + sub->rtp = NULL; + } + memset(sub->magic, 0, sizeof(sub->magic)); + mgcp_queue_hangup(sub); + dump_cmd_queues(NULL, sub); + ast_mutex_unlock(&sub->lock); + sub = sub->next; + } + + if (e->dsp) { + ast_dsp_free(e->dsp); + } + + dump_queue(e->parent, e); + dump_cmd_queues(e, NULL); - for (i = 0; i < MAX_SUBS; i++) { - ast_mutex_lock(&sub->lock); - if (strlen(sub->cxident)) { - transmit_connection_del(sub); - } - if (sub->rtp) { - ast_rtp_destroy(sub->rtp); - sub->rtp = NULL; - } - memset(sub->magic, 0, sizeof(sub->magic)); - mgcp_queue_hangup(sub); - dump_cmd_queues(NULL, sub); - ast_mutex_unlock(&sub->lock); - sub = sub->next; - } - - if (e->dsp) { - ast_dsp_free(e->dsp); - } - - dump_queue(e->parent, e); - dump_cmd_queues(e, NULL); - - sub = e->sub; - for (i = 0; (i < MAX_SUBS) && sub; i++) { - s = sub; - sub = sub->next; - ast_mutex_destroy(&s->lock); - ast_mutex_destroy(&s->cx_queue_lock); - free(s); - } - ast_mutex_destroy(&e->lock); - ast_mutex_destroy(&e->rqnt_queue_lock); - ast_mutex_destroy(&e->cmd_queue_lock); - free(e); + sub = e->sub; + for (i = 0; (i < MAX_SUBS) && sub; i++) { + s = sub; + sub = sub->next; + ast_mutex_destroy(&s->lock); + ast_mutex_destroy(&s->cx_queue_lock); + free(s); + } + ast_mutex_destroy(&e->lock); + ast_mutex_destroy(&e->rqnt_queue_lock); + ast_mutex_destroy(&e->cmd_queue_lock); + free(e); } static void destroy_gateway(struct mgcp_gateway *g) { - if (g->ha) - ast_free_ha(g->ha); + if (g->ha) + ast_free_ha(g->ha); - dump_queue(g, NULL); + dump_queue(g, NULL); - free (g); + free (g); } static void prune_gateways(void) { - struct mgcp_gateway *g, *z, *r; - struct mgcp_endpoint *e, *p, *t; + struct mgcp_gateway *g, *z, *r; + struct mgcp_endpoint *e, *p, *t; + + ast_mutex_lock(&gatelock); + + /* prune gateways */ + for (z = NULL, g = gateways; g;) { + /* prune endpoints */ + for (p = NULL, e = g->endpoints; e; ) { + if (e->delme || g->delme) { + t = e; + e = e->next; + if (!p) + g->endpoints = e; + else + p->next = e; + destroy_endpoint(t); + } else { + p = e; + e = e->next; + } + } + + if (g->delme) { + r = g; + g = g->next; + if (!z) + gateways = g; + else + z->next = g; + + destroy_gateway(r); + } else { + z = g; + g = g->next; + } + } - ast_mutex_lock(&gatelock); - - /* prune gateways */ - for (z = NULL, g = gateways; g;) { - /* prune endpoints */ - for (p = NULL, e = g->endpoints; e; ) { - if (e->delme || g->delme) { - t = e; - e = e->next; - if (!p) - g->endpoints = e; - else - p->next = e; - destroy_endpoint(t); - } - else { - p = e; - e = e->next; - } - } - - if (g->delme) { - r = g; - g = g->next; - if (!z) - gateways = g; - else - z->next = g; - - destroy_gateway(r); - } - else { - z = g; - g = g->next; - } - } - - ast_mutex_unlock(&gatelock); + ast_mutex_unlock(&gatelock); } static int reload_config(void) @@ -4010,7 +4012,8 @@ struct mgcp_endpoint *e; char iabuf[INET_ADDRSTRLEN]; char *cat; - struct ast_hostent ahp; struct hostent *hp; + struct ast_hostent ahp; + struct hostent *hp; int format; if (gethostname(ourhost, sizeof(ourhost))) { @@ -4072,24 +4075,24 @@ v = v->next; } - /* SC: mark existing entries for deletion */ - ast_mutex_lock(&gatelock); - g = gateways; - while (g) { - g->delme = 1; + /* SC: mark existing entries for deletion */ + ast_mutex_lock(&gatelock); + g = gateways; + while (g) { + g->delme = 1; e = g->endpoints; - while (e) { - e->delme = 1; - e = e->next; - } - g = g->next; - } - ast_mutex_unlock(&gatelock); + while (e) { + e->delme = 1; + e = e->next; + } + g = g->next; + } + ast_mutex_unlock(&gatelock); cat = ast_category_browse(cfg, NULL); while(cat) { if (strcasecmp(cat, "general")) { - ast_mutex_lock(&gatelock); + ast_mutex_lock(&gatelock); g = build_gateway(cat, ast_variable_browse(cfg, cat)); if (g) { if (option_verbose > 2) { @@ -4098,7 +4101,7 @@ g->next = gateways; gateways = g; } - ast_mutex_unlock(&gatelock); + ast_mutex_unlock(&gatelock); /* FS: process queue and IO */ if (monitor_thread == pthread_self()) { @@ -4118,7 +4121,7 @@ hp = ast_gethostbyname(ourhost, &ahp); if (!hp) { ast_log(LOG_WARNING, "Unable to get our IP address, MGCP disabled\n"); - ast_destroy(cfg); + ast_destroy(cfg); return 0; } memcpy(&__ourip, hp->h_addr, sizeof(__ourip)); @@ -4140,8 +4143,8 @@ } else { if (bind(mgcpsock, (struct sockaddr *)&bindaddr, sizeof(bindaddr)) < 0) { ast_log(LOG_WARNING, "Failed to bind to %s:%d: %s\n", - ast_inet_ntoa(iabuf, sizeof(iabuf), bindaddr.sin_addr), ntohs(bindaddr.sin_port), - strerror(errno)); + ast_inet_ntoa(iabuf, sizeof(iabuf), bindaddr.sin_addr), ntohs(bindaddr.sin_port), + strerror(errno)); close(mgcpsock); mgcpsock = -1; } else { @@ -4152,61 +4155,61 @@ } if (setsockopt(mgcpsock, IPPROTO_IP, IP_TOS, &tos, sizeof(tos))) ast_log(LOG_WARNING, "Unable to set TOS to %d\n", tos); - } + } } ast_mutex_unlock(&netlock); ast_destroy(cfg); - /* SC: send audit only to the new endpoints */ - g = gateways; - while (g) { + /* SC: send audit only to the new endpoints */ + g = gateways; + while (g) { e = g->endpoints; - while (e && e->needaudit) { - e->needaudit = 0; - transmit_audit_endpoint(e); + while (e && e->needaudit) { + e->needaudit = 0; + transmit_audit_endpoint(e); ast_verbose(VERBOSE_PREFIX_3 "MGCP Auditing endpoint %s@%s for hookstate\n", e->name, g->name); - e = e->next; - } - g = g->next; - } + e = e->next; + } + g = g->next; + } return 0; } int load_module() { - int res; + int res; sched = sched_context_create(); if (!sched) { ast_log(LOG_WARNING, "Unable to create schedule context\n"); - return -1; + return -1; } io = io_context_create(); if (!io) { ast_log(LOG_WARNING, "Unable to create I/O context\n"); - return -1; + return -1; } - if (!(res = reload_config())) { - /* Make sure we can register our mgcp channel type */ - if (ast_channel_register(type, tdesc, capability, mgcp_request)) { - ast_log(LOG_ERROR, "Unable to register channel class %s\n", type); - return -1; - } - mgcp_rtp.type = type; - ast_rtp_proto_register(&mgcp_rtp); - ast_cli_register(&cli_show_endpoints); - ast_cli_register(&cli_audit_endpoint); - ast_cli_register(&cli_debug); - ast_cli_register(&cli_no_debug); - ast_cli_register(&cli_mgcp_reload); - - /* And start the monitor for the first time */ - restart_monitor(); - } + if (!(res = reload_config())) { + /* Make sure we can register our mgcp channel type */ + if (ast_channel_register(type, tdesc, capability, mgcp_request)) { + ast_log(LOG_ERROR, "Unable to register channel class %s\n", type); + return -1; + } + mgcp_rtp.type = type; + ast_rtp_proto_register(&mgcp_rtp); + ast_cli_register(&cli_show_endpoints); + ast_cli_register(&cli_audit_endpoint); + ast_cli_register(&cli_debug); + ast_cli_register(&cli_no_debug); + ast_cli_register(&cli_mgcp_reload); - return res; + /* And start the monitor for the first time */ + restart_monitor(); + } + + return res; } static int mgcp_do_reload(void) @@ -4229,8 +4232,8 @@ int reload(void) { - mgcp_reload(0, 0, NULL); - return 0; + mgcp_reload(0, 0, NULL); + return 0; } int unload_module() @@ -4243,7 +4246,7 @@ /* Hangup all interfaces if they have an owner */ p = iflist; while(p) { - mgcp_queue_hangup(p); + mgcp_queue_hangup(p); p = p->next; } iflist = NULL; @@ -4305,4 +4308,3 @@ { return desc; } -