kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +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@46581 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-10-31 07:03:05 +00:00
parent 4a00839358
commit 088684b275
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_agi.c
View File

@@ -507,12 +507,12 @@ static int handle_controlstreamfile(struct ast_channel *chan, AGI *agi, int argc
if ((argc > 5) && (sscanf(argv[5], "%d", &skipms) != 1)) if ((argc > 5) && (sscanf(argv[5], "%d", &skipms) != 1))
return RESULT_SHOWUSAGE; return RESULT_SHOWUSAGE;
if (argc > 6 && !ast_strlen_zero(argv[8])) if (argc > 6 && !ast_strlen_zero(argv[6]))
fwd = argv[6]; fwd = argv[6];
else else
fwd = "#"; fwd = "#";
if (argc > 7 && !ast_strlen_zero(argv[8])) if (argc > 7 && !ast_strlen_zero(argv[7]))
rev = argv[7]; rev = argv[7];
else else
rev = "*"; rev = "*";

1
utils.c
View File

@@ -195,6 +195,7 @@ struct hostent *ast_gethostbyname(const char *host, struct ast_hostent *hp)
if (dots != 3) if (dots != 3)
return NULL; return NULL;
memset(hp, 0, sizeof(struct ast_hostent)); memset(hp, 0, sizeof(struct ast_hostent));
hp->hp.h_addrtype = AF_INET;
hp->hp.h_addr_list = (void *) hp->buf; hp->hp.h_addr_list = (void *) hp->buf;
hp->hp.h_addr = hp->buf + sizeof(void *); hp->hp.h_addr = hp->buf + sizeof(void *);
if (inet_pton(AF_INET, host, hp->hp.h_addr) > 0) if (inet_pton(AF_INET, host, hp->hp.h_addr) > 0)