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

Diff of /main/sip/resiprocate/dum/Dialog.cxx

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

revision 3482 by derek, Mon Nov 15 20:20:37 2004 UTC revision 3483 by jason, Thu Nov 18 19:21:15 2004 UTC
# Line 98  Line 98 
98                 else                 else
99                 {                 {
100                    InfoLog(<< "Got an INVITE or SUBSCRIBE with invalid scheme");                    InfoLog(<< "Got an INVITE or SUBSCRIBE with invalid scheme");
101                    DebugLog(<< request);                    InfoLog(<< request);
102                    throw Exception("Invalid scheme in request", __FILE__, __LINE__);                    throw Exception("Invalid scheme in request", __FILE__, __LINE__);
103                 }                 }
104              }              }
105              else              else
106              {              {
107                 InfoLog (<< "Got an INVITE or SUBSCRIBE that doesn't have exactly one contact");                 InfoLog (<< "Got an INVITE or SUBSCRIBE that doesn't have exactly one contact");
108                 DebugLog (<< request);                 InfoLog (<< request);
109                 throw Exception("Too many (or no contact) contacts in request", __FILE__, __LINE__);                 throw Exception("Too many (or no contact) contacts in request", __FILE__, __LINE__);
110              }              }
111              break;              break;
# Line 166  Line 166 
166                    {                    {
167                       BaseCreator* creator = mDialogSet.getCreator();                       BaseCreator* creator = mDialogSet.getCreator();
168                       assert(creator);// !jf! throw or something here                       assert(creator);// !jf! throw or something here
169                                           assert(creator->getLastRequest().exists(h_Contacts));
170                         assert(!creator->getLastRequest().header(h_Contacts).empty());
171                       mLocalContact = creator->getLastRequest().header(h_Contacts).front();                       mLocalContact = creator->getLastRequest().header(h_Contacts).front();
172                       mRemoteTarget = contact;                       mRemoteTarget = contact;
173                    }                    }
# Line 771  Line 772 
772    
773     request.remove(h_RecordRoutes);  //!dcm! -- all of this is rather messy     request.remove(h_RecordRoutes);  //!dcm! -- all of this is rather messy
774    
775     request.remove(h_Contacts);       request.header(h_Contacts).clear();  
776     request.header(h_Contacts).push_front(mLocalContact);       request.header(h_Contacts).push_front(mLocalContact);  
777     request.header(h_CSeq).method() = method;     request.header(h_CSeq).method() = method;
778     request.header(h_MaxForwards).value() = 70;     request.header(h_MaxForwards).value() = 70;
# Line 843  Line 844 
844     //not sure of these     //not sure of these
845     request.header(h_To).remove(p_tag);       request.header(h_To).remove(p_tag);  
846     request.remove(h_RecordRoutes);     request.remove(h_RecordRoutes);
847     request.remove(h_Contacts);       request.header(h_Contacts).clear();  
848     request.header(h_Contacts).push_front(mLocalContact);       request.header(h_Contacts).push_front(mLocalContact);  
849     request.header(h_MaxForwards).value() = 70;     request.header(h_MaxForwards).value() = 70;
850  }  }

Legend:
Removed from v.3482  
changed lines
  Added in v.3483

webmaster AT resiprocate DOT org
ViewVC Help
Powered by ViewVC 1.1.27