diff options
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-19 15:49:42 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-19 15:49:42 +0000
commitc99a0e41ec1ccc986f1e85f18bd2cd621bebcd5f (patch)
parent07098477864dc9a66a9c63b9f9c8568a1cf4f7fc (diff)
When processing full frames, take sequence number wraparound into account when
deciding whether or not we need to request retransmissions by sending a VNAK. This code could cause VNAKs to be sent erroneously in some cases, and to not be sent in other cases when it should have been. (closes issue #10237, reported and patched by mihai) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@75927 f38db490-d61c-443f-a65b-d21fe96a405b
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index ad120dbdc..3351d81f9 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -6710,7 +6710,9 @@ static int socket_read(int *id, int fd, short events, void *cbdata)
if (option_debug)
ast_log(LOG_DEBUG, "Packet arrived out of order (expecting %d, got %d) (frametype = %d, subclass = %d)\n",
iaxs[fr->callno]->iseqno, fr->oseqno, f.frametype, f.subclass);
- if (iaxs[fr->callno]->iseqno > fr->oseqno) {
+ /* Check to see if we need to request retransmission,
+ * and take sequence number wraparound into account */
+ if ((unsigned char) (iaxs[fr->callno]->iseqno - fr->oseqno) < 128) {
/* If we've already seen it, ack it XXX There's a border condition here XXX */
if ((f.frametype != AST_FRAME_IAX) ||
((f.subclass != IAX_COMMAND_ACK) && (f.subclass != IAX_COMMAND_INVAL))) {