kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@28379 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-05-18 20:07:21 +00:00
parent 7f5e1b4abe
commit f360986593
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_sip.c
View File

@@ -3592,12 +3592,12 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req)
sdpLineNum_iterator_init(&iterator);
while ((a = get_sdp_iterate(&iterator, req, "a"))[0] != '\0') {
char* mimeSubtype = ast_strdupa(a); /* ensures we have enough space */
if (!strcasecmp(a, "sendonly")) {
sendonly=1;
if (!strcasecmp(a, "sendonly") || !strcasecmp(a, "inactive")) {
sendonly = 1;
continue;
}
if (!strcasecmp(a, "sendrecv")) {
sendonly=0;
sendonly = 0;
}
if (sscanf(a, "rtpmap: %u %[^/]/", &codec, mimeSubtype) != 2) continue;
if (debug)

14
enum.c
View File

@@ -80,27 +80,29 @@ struct naptr {
} __attribute__ ((__packed__));
/*--- parse_ie: Parse NAPTR record information elements */
static int parse_ie(char *data, int maxdatalen, char *src, int srclen)
static unsigned int parse_ie(char *data, unsigned int maxdatalen, char *src, unsigned int srclen)
{
int len, olen;
unsigned int len, olen;
len = olen = (int)src[0];
len = olen = (unsigned int) src[0];
src++;
srclen--;
if (len > srclen || len < 0 ) {
if (len > srclen) {
ast_log(LOG_WARNING, "ENUM parsing failed: Wanted %d characters, got %d\n", len, srclen);
return -1;
}
if (len > maxdatalen)
len = maxdatalen;
memcpy(data, src, len);
return olen + 1;
}
/*--- parse_naptr: Parse DNS NAPTR record used in ENUM ---*/
static int parse_naptr(char *dst, int dstsize, char *tech, int techsize, char *answer, int len, char *naptrinput)
{
char tech_return[80];
char *oanswer = answer;
char flags[512] = "";
@@ -344,7 +346,7 @@ static int txt_callback(void *context, char *answer, int len, char *fullanswer)
/*--- enum_callback: Callback from ENUM lookup function */
static int enum_callback(void *context, char *answer, int len, char *fullanswer)
{
struct enum_context *c = (struct enum_context *)context;
struct enum_context *c = (struct enum_context *)context;
void *p = NULL;
int res;