diff options
| author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-01 16:09:05 +0000 |
|---|---|---|
| committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-01 16:09:05 +0000 |
| commit | 55bf399987a74d68fb87e744617fc5214618d93b (patch) | |
| tree | 5f7af3d12fc4637a8e47285c70ca4f7d3469815d | |
| parent | f23d8b9e2a22f54dd591607e53c62bbe395e0041 (diff) | |
Use ast_sockaddr_from_sin function not memcpy
This resolves some IAX2 registration issue report on the
asterisk-users mailing list.
(closes issue #18202)
Reported by: pabelanger
Patches:
update_registry.patch.v2 uploaded by pabelanger (license 224)
Tested by: pabelanger, Nic Colledge (mailing list)
Review: https://reviewboard.asterisk.org/r/993
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@293496 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_iax2.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 5f962155d..c21c18246 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -8700,7 +8700,7 @@ static int update_registry(struct sockaddr_in *sin, int callno, char *devtype, i peercnt_modify(0, 0, &p->addr); /* Stash the IP address from which they registered */ - memcpy(&p->addr, sin, sizeof(p->addr)); + ast_sockaddr_from_sin(&p->addr, sin); snprintf(data, sizeof(data), "%s:%d:%d", ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port), p->expiry); if (!ast_test_flag64(p, IAX_TEMPONLY) && sin->sin_addr.s_addr) { @@ -11190,10 +11190,13 @@ immediatedial: if ((ast_strlen_zero(iaxs[fr->callno]->secret) && ast_strlen_zero(iaxs[fr->callno]->inkeys)) || ast_test_flag(&iaxs[fr->callno]->state, IAX_STATE_AUTHENTICATED)) { - if (f.subclass.integer == IAX_COMMAND_REGREL) + if (f.subclass.integer == IAX_COMMAND_REGREL) { memset(&sin, 0, sizeof(sin)); - if (update_registry(&sin, fr->callno, ies.devicetype, fd, ies.refresh)) + sin.sin_family = AF_INET; + } + if (update_registry(&sin, fr->callno, ies.devicetype, fd, ies.refresh)) { ast_log(LOG_WARNING, "Registry error\n"); + } if (!iaxs[fr->callno]) { break; } |