[Linphone-developers] [PATCH] zrtp: use session's seq_number for zrtp packets

[Dmitry Monakhov]

Currently seq_number for zrtp initiated to random value so
seq_numbers for rtp and zrtp packets will have different base
which is incorrect because other parts expect to receive packets
with monolithic seq_numbers.
Let's use common session.rtp.snd_seq counter. ASAIU it is safe to
modify counter w/o locking from zrtp callback because it is called
from sender context.

Signed-off-by: Dmitry Monakhov <address@hidden>
---
 src/zrtp.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/zrtp.c b/src/zrtp.c
index bb653cd..3a35876 100644
--- a/src/zrtp.c
+++ b/src/zrtp.c
@@ -50,7 +50,6 @@ struct _OrtpZrtpContext{
        RtpSession *session;
        uint32_t timerWillTriggerAt;
        uint16_t last_recv_zrtp_seq_number;
-       uint16_t last_sent_zrtp_seq_number;
        srtp_t srtpSend;
        srtp_t srtpRecv;
        zrtp_Callbacks zrtp_cb;
@@ -197,7 +196,7 @@ static int32_t ozrtp_sendDataZRTP (ZrtpContext* ctx, const 
uint8_t* data, const
        uint8_t *buffer8=(uint8_t*)buffer32;
        uint16_t *buffer16=(uint16_t*)buffer32;
 
-       uint16_t seqNumber=userData->last_sent_zrtp_seq_number++;
+       uint16_t seqNumber=session->rtp.snd_seq++;
 
        *buffer8 = 0x10;
        buffer8[1]=0;
@@ -769,7 +768,6 @@ static OrtpZrtpContext* createUserData(ZrtpContext 
*context) {
        userData->zrtpContext=context;
        userData->timerWillTriggerAt=0;
        userData->last_recv_zrtp_seq_number=0;
-       userData->last_sent_zrtp_seq_number=rand()+1; // INT_MAX+1 (signed)
 
        userData->srtpRecv=NULL;
        userData->srtpSend=NULL;
-- 
1.7.9.5