Index: main/udptl.c =================================================================== --- main/udptl.c (revision 89114) +++ main/udptl.c (working copy) @@ -369,7 +369,7 @@ s->f[ifp_no].subclass = AST_MODEM_T38; s->f[ifp_no].mallocd = 0; - //s->f[ifp_no].???seq_no = seq_no - i; + s->f[ifp_no].seqno = seq_no - i; s->f[ifp_no].datalen = lengths[i - 1]; s->f[ifp_no].data = (uint8_t *) bufs[i - 1]; s->f[ifp_no].offset = 0; @@ -381,23 +381,6 @@ } } } - /* If packets are received out of sequence, we may have already processed this packet from the error - recovery information in a packet already received. */ - if (seq_no >= s->rx_seq_no) { - /* Decode the primary IFP packet */ - s->f[ifp_no].frametype = AST_FRAME_MODEM; - s->f[ifp_no].subclass = AST_MODEM_T38; - - s->f[ifp_no].mallocd = 0; - //s->f[ifp_no].???seq_no = seq_no; - s->f[ifp_no].datalen = ifp_len; - s->f[ifp_no].data = (uint8_t *) ifp; - s->f[ifp_no].offset = 0; - s->f[ifp_no].src = "UDPTL"; - if (ifp_no > 0) - AST_LIST_NEXT(&s->f[ifp_no - 1], frame_list) = &s->f[ifp_no]; - AST_LIST_NEXT(&s->f[ifp_no], frame_list) = NULL; - } } else { @@ -488,7 +471,7 @@ s->f[ifp_no].subclass = AST_MODEM_T38; s->f[ifp_no].mallocd = 0; - //s->f[ifp_no].???seq_no = j; + s->f[ifp_no].seqno = j; s->f[ifp_no].datalen = s->rx[l].buf_len; s->f[ifp_no].data = s->rx[l].buf; s->f[ifp_no].offset = 0; @@ -499,12 +482,17 @@ ifp_no++; } } + } + + /* If packets are received out of sequence, we may have already processed this packet from the error + recovery information in a packet already received. */ + if (seq_no >= s->rx_seq_no) { /* Decode the primary IFP packet */ s->f[ifp_no].frametype = AST_FRAME_MODEM; s->f[ifp_no].subclass = AST_MODEM_T38; - + s->f[ifp_no].mallocd = 0; - //s->f[ifp_no].???seq_no = j; + s->f[ifp_no].seqno = seq_no; s->f[ifp_no].datalen = ifp_len; s->f[ifp_no].data = (uint8_t *) ifp; s->f[ifp_no].offset = 0; @@ -938,7 +926,7 @@ printf("Sent %d bytes of UDPTL data to %s:%d\n", res, ast_inet_ntoa(udptl->them.sin_addr), ntohs(udptl->them.sin_port)); #endif if (udptl_debug_test_addr(&s->them)) - ast_verbose("Sent UDPTL packet to %s:%d (type %d, seq %d, len %d)\n", + ast_verb(1, "Sent UDPTL packet to %s:%d (type %d, seq %d, len %d)\n", ast_inet_ntoa(s->them.sin_addr), ntohs(s->them.sin_port), 0, s->seqno, len); }