diff options
author | Joshua Colp <jcolp@digium.com> | 2016-05-19 05:33:13 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-05-19 05:33:13 -0500 |
commit | acbaa1b0cfeacf368fce3c2ad93df935af2de7f9 (patch) | |
tree | 56c50ef917937b1a6160a6a95c3a3987ba4285a6 | |
parent | 5acb25722ca16e06b14514743923125a055d1867 (diff) | |
parent | 6e5e84458fe89b22e4883364aa9f66b1005f9985 (diff) |
Merge "udptl: Don't eat sequence numbers until OK is received"
-rw-r--r-- | main/udptl.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/main/udptl.c b/main/udptl.c index a0f533fd0..e543b4e8e 100644 --- a/main/udptl.c +++ b/main/udptl.c @@ -769,6 +769,18 @@ struct ast_frame *ast_udptl_read(struct ast_udptl *udptl) return &ast_null_frame; } + /* + * If early media isn't turned on for the channel driver, it's going to + * drop this frame. By that time though, udptl has already incremented + * the expected sequence number so if the CPE re-sends, the second frame + * will be dropped as a dup even though the first frame never went through. + * So we drop the frame here if the channel isn't up. 'tag' is set by the + * channel drivers on T38_ENABLED or T38_PEER_REINVITE. + */ + if (udptl->tag == NULL) { + return &ast_null_frame; + } + if (udptl->nat) { /* Send to whoever sent to us */ if (ast_sockaddr_cmp(&udptl->them, &addr)) { |