/[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 3081 by derek, Thu Jul 8 22:52:03 2004 UTC revision 3082 by derek, Fri Jul 9 01:23:36 2004 UTC
# Line 16  Line 16 
16  #include "resiprocate/dum/ServerOutOfDialogReq.hxx"  #include "resiprocate/dum/ServerOutOfDialogReq.hxx"
17  #include "resiprocate/dum/ServerRegistration.hxx"  #include "resiprocate/dum/ServerRegistration.hxx"
18  #include "resiprocate/dum/ServerSubscription.hxx"  #include "resiprocate/dum/ServerSubscription.hxx"
19    #include "resiprocate/dum/SubscriptionHandler.hxx"
20  #include "resiprocate/dum/ClientPublication.hxx"  #include "resiprocate/dum/ClientPublication.hxx"
21  #include "resiprocate/dum/ServerPublication.hxx"  #include "resiprocate/dum/ServerPublication.hxx"
22  #include "resiprocate/os/Logger.hxx"  #include "resiprocate/os/Logger.hxx"
# Line 499  Line 500 
500                 {                 {
501                    client->dispatch(response);                    client->dispatch(response);
502                 }                 }
503                   else
504                   {
505                      //!dcm! -- can't subscribe in an existing Dialog, this is all
506                      //a bit of a hack.
507                      BaseCreator* creator = mDialogSet.getCreator();
508                      assert(creator);
509                      assert(creator->getLastRequest().exists(h_Event));
510                      ClientSubscriptionHandler* handler =
511                         mDum.getClientSubscriptionHandler(creator->getLastRequest().header(h_Event).value());
512                      assert(handler);
513                      handler->onTerminated(ClientSubscriptionHandle::NotValid(), response);
514                      possiblyDie();
515                   }
516              }              }
517           }           }
518           break;           break;
# Line 833  Line 847 
847        assert(request.header(h_RequestLine).getMethod() == INVITE ||        assert(request.header(h_RequestLine).getMethod() == INVITE ||
848               request.header(h_RequestLine).getMethod() == SUBSCRIBE ||               request.header(h_RequestLine).getMethod() == SUBSCRIBE ||
849               request.header(h_RequestLine).getMethod() == BYE ||               request.header(h_RequestLine).getMethod() == BYE ||
850               request.header(h_RequestLine).getMethod() == CANCEL);               request.header(h_RequestLine).getMethod() == CANCEL ||
851                 request.header(h_RequestLine).getMethod() == NOTIFY
852                 );
853                
854        assert (request.header(h_RequestLine).getMethod() == CANCEL ||  // Contact header is not required for Requests that do not form a dialog        assert (request.header(h_RequestLine).getMethod() == CANCEL ||  // Contact header is not required for Requests that do not form a dialog
855                        request.header(h_RequestLine).getMethod() == BYE ||                        request.header(h_RequestLine).getMethod() == BYE ||

Legend:
Removed from v.3081  
changed lines
  Added in v.3082

webmaster AT resiprocate DOT org
ViewVC Help
Powered by ViewVC 1.1.27