kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 10:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qualify that SIP INFO stuff is real (bug #1558)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2894 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-05-05 01:56:03 +00:00
parent cc9ffa5ac1
commit cc1da2eb5b
2 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
aesopt.h
View File

@@ -158,7 +158,9 @@
# include <machine/endian.h>
#elif defined( __GNUC__ ) || defined( __GNU_LIBRARY__ )
# include <endian.h>
#if !defined(__APPLE__)
# include <byteswap.h>
#endif
#elif defined( linux )
# include <endian.h>
#endif

41
channels/chan_sip.c
View File

@@ -4840,6 +4840,7 @@ static int sip_show_channel(int fd, int argc, char *argv[])
return RESULT_SUCCESS;
}
static void receive_info(struct sip_pvt *p, struct sip_request *req)
{
char buf[1024] = "";
@@ -4847,19 +4848,23 @@ static void receive_info(struct sip_pvt *p, struct sip_request *req)
char resp = 0;
struct ast_frame f;
char *c;
/* Try getting the "signal=" part */
if (!ast_strlen_zero(c = get_sdp(req, "Signal")) || !ast_strlen_zero(c = get_sdp(req, "d"))) {
strncpy(buf, c, sizeof(buf) - 1);
} else if (get_msg_text(buf, sizeof(buf), req)) {
/* Normal INFO method */
ast_log(LOG_WARNING, "Unable to retrieve text from %s\n", p->callid);
return;
}
if (p->owner) {
if (!ast_strlen_zero(buf)) {
if (sip_debug_test_pvt(p))
ast_verbose("DTMF received: '%c'\n", buf[0]);
/* Need to check the media/type */
if (!strcasecmp(get_header(req, "Content-Type"), "application/dtmf-relay")) {
/* Try getting the "signal=" part */
if (strlen(c = get_sdp(req, "Signal")) || strlen(c = get_sdp(req, "d"))) {
strncpy(buf, c, sizeof(buf) - 1);
} else {
ast_log(LOG_WARNING, "Unable to retrieve DTMF signal from INFO message from %s\n", p->callid);
transmit_response(p, "200 OK", req); /* Should return error */
return;
}
if (p->owner) { /* PBX call */
if (!ast_strlen_zero(buf)) {
if (sipdebug)
ast_verbose("* DTMF received: '%c'\n", buf[0]);
if (buf[0] == '*')
event = 10;
else if (buf[0] == '#')
@@ -4875,6 +4880,7 @@ static void receive_info(struct sip_pvt *p, struct sip_request *req)
} else if (event < 16) {
resp = 'A' + (event - 12);
}
/* Build DTMF frame and deliver to PBX for transmission to other call leg*/
memset(&f, 0, sizeof(f));
f.frametype = AST_FRAME_DTMF;
f.subclass = resp;
@@ -4882,8 +4888,19 @@ static void receive_info(struct sip_pvt *p, struct sip_request *req)
f.data = NULL;
f.datalen = 0;
ast_queue_frame(p->owner, &f);
}
transmit_response(p, "200 OK", req);
return;
}
transmit_response(p, "481 Call leg/transaction does not exist", req);
return;
}
/* Other type of INFO message, not really understood by Asterisk */
/* if (get_msg_text(buf, sizeof(buf), req)) { */
ast_log(LOG_WARNING, "Unable to parse INFO message from %s. Content %s\n", p->callid, buf);
transmit_response(p, "415 Unsupported media type", req);
return;
}
static int sip_do_debug_ip(int fd, int argc, char *argv[])