diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-31 07:03:05 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-31 07:03:05 +0000 |
| commit | 2809cd21972e357b35dd769eb072f190e03e7dc1 (patch) | |
| tree | 4b60cbb78f96e0e12afb5983b2a48852009d4ceb | |
| parent | ce3eb014ffe410b097a3fdc85223285d03c4fb92 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@46581 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | res/res_agi.c | 4 | ||||
| -rw-r--r-- | utils.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index 56ab7bf42..022cee46e 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -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)) return RESULT_SHOWUSAGE; - if (argc > 6 && !ast_strlen_zero(argv[8])) + if (argc > 6 && !ast_strlen_zero(argv[6])) fwd = argv[6]; else fwd = "#"; - if (argc > 7 && !ast_strlen_zero(argv[8])) + if (argc > 7 && !ast_strlen_zero(argv[7])) rev = argv[7]; else rev = "*"; @@ -195,6 +195,7 @@ struct hostent *ast_gethostbyname(const char *host, struct ast_hostent *hp) if (dots != 3) return NULL; 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 = hp->buf + sizeof(void *); if (inet_pton(AF_INET, host, hp->hp.h_addr) > 0) |