diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-31 13:51:30 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-31 13:51:30 +0000 |
| commit | 89c07859619cfd1295d8586a7b150e10e807bd07 (patch) | |
| tree | 6d9cfc83ac2145634355614362bafa6b6546a63a | |
| parent | 0c84a12d699725498e42c53ec12b713468cc3a0e (diff) | |
Cleaning up code
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@46649 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 5a2332417..8bd383474 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -2740,33 +2740,33 @@ static int create_addr(struct sip_pvt *dialog, const char *opeer) { struct hostent *hp; struct ast_hostent ahp; - struct sip_peer *p; + struct sip_peer *peer; char *port; int portno; char host[MAXHOSTNAMELEN], *hostn; - char peer[256]; + char peername[256]; - ast_copy_string(peer, opeer, sizeof(peer)); - port = strchr(peer, ':'); + ast_copy_string(peername, opeer, sizeof(peername)); + port = strchr(peername, ':'); if (port) *port++ = '\0'; dialog->sa.sin_family = AF_INET; dialog->timer_t1 = 500; /* Default SIP retransmission timer T1 (RFC 3261) */ - p = find_peer(peer, NULL, 1); + peer = find_peer(peername, NULL, 1); - if (p) { - int res = create_addr_from_peer(dialog, p); - ASTOBJ_UNREF(p, sip_destroy_peer); + if (peer) { + int res = create_addr_from_peer(dialog, peer); + ASTOBJ_UNREF(peer, sip_destroy_peer); return res; } - hostn = peer; + hostn = peername; portno = port ? atoi(port) : STANDARD_SIP_PORT; if (srvlookup) { char service[MAXHOSTNAMELEN]; int tportno; int ret; - snprintf(service, sizeof(service), "_sip._udp.%s", peer); + snprintf(service, sizeof(service), "_sip._udp.%s", peername); ret = ast_get_srv(NULL, host, sizeof(host), &tportno, service); if (ret > 0) { hostn = host; @@ -2775,10 +2775,10 @@ static int create_addr(struct sip_pvt *dialog, const char *opeer) } hp = ast_gethostbyname(hostn, &ahp); if (!hp) { - ast_log(LOG_WARNING, "No such host: %s\n", peer); + ast_log(LOG_WARNING, "No such host: %s\n", peername); return -1; } - ast_string_field_set(dialog, tohost, peer); + ast_string_field_set(dialog, tohost, peername); memcpy(&dialog->sa.sin_addr, hp->h_addr, sizeof(dialog->sa.sin_addr)); dialog->sa.sin_port = htons(portno); dialog->recv = dialog->sa; |