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

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

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

revision 3006 by derek, Sat Jun 19 01:10:02 2004 UTC revision 3024 by derek, Tue Jun 22 22:10:19 2004 UTC
# Line 70  Line 70 
70           default:           default:
71              mType = Fake;              mType = Fake;
72        }        }
73              if (request.exists(h_RecordRoutes))
74          {
75        mRouteSet = request.header(h_RecordRoutes); // !jf! is this right order        mRouteSet = request.header(h_RecordRoutes); // !jf! is this right order
76          }
77    
78        switch (request.header(h_CSeq).method())        switch (request.header(h_CSeq).method())
79        {        {
# Line 697  Line 699 
699    
700     request.header(h_CallId) = mCallId;     request.header(h_CallId) = mCallId;
701    
    request.header(h_Routes) = mRouteSet;  
702     request.remove(h_RecordRoutes);  //!dcm! -- all of this is rather messy     request.remove(h_RecordRoutes);  //!dcm! -- all of this is rather messy
703    
704     request.remove(h_Contacts);       request.remove(h_Contacts);  
# Line 708  Line 709 
709     //must keep old via for cancel     //must keep old via for cancel
710     if (method != CANCEL)     if (method != CANCEL)
711     {     {
712          request.header(h_Routes) = mRouteSet;
713        request.remove(h_Vias);              request.remove(h_Vias);      
714        Via via;        Via via;
715        via.param(p_branch); // will create the branch        via.param(p_branch); // will create the branch
# Line 717  Line 719 
719     {     {
720        assert(request.exists(h_Vias));        assert(request.exists(h_Vias));
721     }     }
722     //don'y increment CSeq for ACK     //don't increment CSeq for ACK or CANCEL
723     if (method != ACK)     if (method != ACK && method != CANCEL)
724     {     {
725        request.header(h_CSeq).sequence() = ++mLocalCSeq;        request.header(h_CSeq).sequence() = ++mLocalCSeq;
726     }     }
# Line 744  Line 746 
746        assert(request.isRequest());        assert(request.isRequest());
747        assert(request.header(h_RequestLine).getMethod() == INVITE ||        assert(request.header(h_RequestLine).getMethod() == INVITE ||
748               request.header(h_RequestLine).getMethod() == SUBSCRIBE ||               request.header(h_RequestLine).getMethod() == SUBSCRIBE ||
749               request.header(h_RequestLine).getMethod() == BYE);               request.header(h_RequestLine).getMethod() == BYE ||
750                 request.header(h_RequestLine).getMethod() == CANCEL);
751                
752        assert (request.header(h_Contacts).size() == 1);        assert (request.header(h_Contacts).size() == 1);
753        Helper::makeResponse(response, request, code, mLocalContact);        Helper::makeResponse(response, request, code, mLocalContact);

Legend:
Removed from v.3006  
changed lines
  Added in v.3024

webmaster AT resiprocate DOT org
ViewVC Help
Powered by ViewVC 1.1.27