mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 10:47:18 +00:00 
			
		
		
		
	Revised seqno fix (bug #2887)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4281 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		
							
								
								
									
										10
									
								
								rtp.c
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								rtp.c
									
									
									
									
									
								
							| @@ -79,7 +79,7 @@ struct ast_rtp { | ||||
| 	unsigned int lastrxts; | ||||
| 	unsigned int lastividtimestamp; | ||||
| 	unsigned int lastovidtimestamp; | ||||
| 	unsigned int lasteventtimestamp; | ||||
| 	unsigned int lasteventseqn; | ||||
| 	int lasttxformat; | ||||
| 	int lastrxformat; | ||||
| 	int dtmfcount; | ||||
| @@ -490,16 +490,16 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp) | ||||
| 	  /* This is special in-band data that's not one of our codecs */ | ||||
| 	  if (rtpPT.code == AST_RTP_DTMF) { | ||||
| 	    /* It's special -- rfc2833 process it */ | ||||
| 	    if (rtp->lasteventtimestamp <= timestamp) { | ||||
| 	    if (rtp->lasteventseqn <= seqno || rtp->resp == 0 || (rtp->lasteventseqn >= 65530 && seqno <= 6)) { | ||||
| 	      f = process_rfc2833(rtp, rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen, res - hdrlen); | ||||
| 	      rtp->lasteventtimestamp = timestamp; | ||||
| 	      rtp->lasteventseqn = seqno; | ||||
| 	    } else f = NULL; | ||||
| 	    if (f) return f; else return &null_frame; | ||||
| 	  } else if (rtpPT.code == AST_RTP_CISCO_DTMF) { | ||||
| 	    /* It's really special -- process it the Cisco way */ | ||||
| 	    if (rtp->lasteventtimestamp <= timestamp) { | ||||
| 	    if (rtp->lasteventseqn <= seqno || rtp->resp == 0 || (rtp->lasteventseqn >= 65530 && seqno <= 6)) { | ||||
| 	      f = process_cisco_dtmf(rtp, rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen, res - hdrlen); | ||||
| 	      rtp->lasteventtimestamp = timestamp; | ||||
| 	      rtp->lasteventseqn = seqno; | ||||
| 	    } else f = NULL; | ||||
| 	    if (f) return f; else return &null_frame; | ||||
| 	  } else if (rtpPT.code == AST_RTP_CN) { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user