/[resiprocate]/main/resip/dum/MergedRequestKey.cxx
ViewVC logotype

Diff of /main/resip/dum/MergedRequestKey.cxx

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

branches/b-directory-reorg/resip/dum/MergedRequestKey.cxx revision 5276 by jason, Fri Aug 19 00:23:17 2005 UTC main/resip/dum/MergedRequestKey.cxx revision 6790 by sgodin, Fri Nov 10 17:43:02 2006 UTC
# Line 1  Line 1 
1  #include "resip/dum/MergedRequestKey.hxx"  #include "resip/dum/MergedRequestKey.hxx"
2  #include "resip/sip/SipMessage.hxx"  #include "resip/stack/SipMessage.hxx"
3  #include "resip/sip/CSeqCategory.hxx"  #include "resip/stack/CSeqCategory.hxx"
4    
5  using namespace resip;  using namespace resip;
6    
# Line 10  Line 10 
10  {  {
11  }  }
12    
13  MergedRequestKey::MergedRequestKey(const SipMessage& req) :  MergedRequestKey::MergedRequestKey(const SipMessage& req, bool checkRequestUri) :
14     mRequestUri(Data::from(req.header(h_RequestLine).uri())),     mRequestUri(Data::from(req.header(h_RequestLine).uri())),
15     mCSeq(Data::from(req.header(h_CSeq))),     mCSeq(Data::from(req.header(h_CSeq))),
16     mTag(req.header(h_From).exists(p_tag) ? req.header(h_From).param(p_tag) : Data::Empty),     mTag(req.header(h_From).exists(p_tag) ? req.header(h_From).param(p_tag) : Data::Empty),
17     mCallId(req.header(h_CallID).value())     mCallId(req.header(h_CallID).value()),
18       mCheckRequestUri(checkRequestUri)
19  {  {
20  }  }
21    
# Line 24  Line 25 
25     return (mCallId == other.mCallId  &&     return (mCallId == other.mCallId  &&
26             mTag == other.mTag &&             mTag == other.mTag &&
27             mCSeq == other.mCSeq &&             mCSeq == other.mCSeq &&
28             mRequestUri == other.mRequestUri);             (!mCheckRequestUri || (mRequestUri == other.mRequestUri)));
29  }  }
30    
31  bool  bool
# Line 54  Line 55 
55        return false;        return false;
56     }     }
57        
58       if(!mCheckRequestUri)
59       {
60          return (mCSeq < other.mCSeq);
61       }
62       else
63       {
64     if (mCSeq < other.mCSeq)     if (mCSeq < other.mCSeq)
65     {     {
66        return true;        return true;
# Line 65  Line 72 
72        
73     return (mRequestUri < other.mRequestUri);     return (mRequestUri < other.mRequestUri);
74  }  }
75    }
76    
77  Data& MergedRequestKey::cseq()  Data& MergedRequestKey::cseq()
78  {  {

Legend:
Removed from v.5276  
changed lines
  Added in v.6790

webmaster AT resiprocate DOT org
ViewVC Help
Powered by ViewVC 1.1.27