diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-09 23:06:28 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-09 23:06:28 +0000 |
| commit | aab6e11d64bb5fd7760802d72a1294da78a0859c (patch) | |
| tree | ec58c6071a48c8bee4fbab4a25ed934d80ba8cfd /channels | |
| parent | 0dd17fdfd3d6e2f77d2c41a59c2821d4a3b7b346 (diff) | |
Merged revisions 7917 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r7917 | kpfleming | 2006-01-09 16:48:48 -0600 (Mon, 09 Jan 2006) | 2 lines
re-initialize _all_ sequence numbers when transfer completes
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7918 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index c83ce3f27..01ee3fa47 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -5372,6 +5372,7 @@ static int complete_transfer(int callno, struct iax_ies *ies) memset(&pvt->transfer, 0, sizeof(pvt->transfer)); /* Reset sequence numbers */ pvt->oseqno = 0; + pvt->rseqno = 0; pvt->iseqno = 0; pvt->aseqno = 0; pvt->peercallno = peercallno; @@ -6582,8 +6583,8 @@ static int socket_read(int *id, int fd, short events, void *cbdata) /* Handle implicit ACKing unless this is an INVAL, and only if this is from the real peer, not the transfer peer */ if (!inaddrcmp(&sin, &iaxs[fr.callno]->addr) && - (((f.subclass != IAX_COMMAND_INVAL)) || - (f.frametype != AST_FRAME_IAX))) { + ((f.subclass != IAX_COMMAND_INVAL) || + (f.frametype != AST_FRAME_IAX))) { unsigned char x; /* XXX This code is not very efficient. Surely there is a better way which still properly handles boundary conditions? XXX */ |