/[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 2995 by derek, Tue Jun 15 22:15:58 2004 UTC revision 2997 by derek, Wed Jun 16 01:08:25 2004 UTC
# Line 255  Line 255 
255              }              }
256              mInviteSession->dispatch(request);              mInviteSession->dispatch(request);
257              break;              break;
258                           case BYE:
259                if (mInviteSession == 0)
260                {
261                   InfoLog ( << "Spurious BYE" );
262                   return;              
263                }
264                else
265                {
266                   mInviteSession->dispatch(request);
267                }
268                break;
269           case ACK:           case ACK:
270           case CANCEL:           case CANCEL:
271              if (mInviteSession == 0)              if (mInviteSession == 0)
# Line 330  Line 340 
340              break;              break;
341                                
342           default:           default:
343                InfoLog ( << "In Dialog::dispatch, default(ServerOutOfDialogRequest), msg: " << msg );            
344              // only can be one ServerOutOfDialogReq at a time              // only can be one ServerOutOfDialogReq at a time
345              assert(mServerOutOfDialogRequest == 0);              assert(mServerOutOfDialogRequest == 0);
346              mServerOutOfDialogRequest = makeServerOutOfDialog(request);              mServerOutOfDialogRequest = makeServerOutOfDialog(request);
# Line 417  Line 428 
428                 mInviteSession->dispatch(response);                 mInviteSession->dispatch(response);
429              }              }
430              break;              break;
431                           case BYE:
432           case ACK:           case ACK:
433           case CANCEL:           case CANCEL:
434              if (mInviteSession != 0)              if (mInviteSession != 0)
# Line 673  Line 684 
684  //   request.header(h_From).param(p_tag) = mId.getLocalTag();  //   request.header(h_From).param(p_tag) = mId.getLocalTag();
685    
686     request.header(h_CallId) = mCallId;     request.header(h_CallId) = mCallId;
687    
688     request.header(h_Routes) = mRouteSet;     request.header(h_Routes) = mRouteSet;
689       request.remove(h_RecordRoutes);  //!dcm! -- all of this is rather messy
690    
691     request.remove(h_Contacts);       request.remove(h_Contacts);  
692     request.header(h_Contacts).push_front(mLocalContact);       request.header(h_Contacts).push_front(mLocalContact);  
693     request.header(h_CSeq).method() = method;     request.header(h_CSeq).method() = method;
# Line 717  Line 731 
731     {     {
732        assert(request.isRequest());        assert(request.isRequest());
733        assert(request.header(h_RequestLine).getMethod() == INVITE ||        assert(request.header(h_RequestLine).getMethod() == INVITE ||
734               request.header(h_RequestLine).getMethod() == SUBSCRIBE);               request.header(h_RequestLine).getMethod() == SUBSCRIBE ||
735                 request.header(h_RequestLine).getMethod() == BYE);
736                
737        assert (request.header(h_Contacts).size() == 1);        assert (request.header(h_Contacts).size() == 1);
738        Helper::makeResponse(response, request, code, mLocalContact);        Helper::makeResponse(response, request, code, mLocalContact);

Legend:
Removed from v.2995  
changed lines
  Added in v.2997

webmaster AT resiprocate DOT org
ViewVC Help
Powered by ViewVC 1.1.27