Skip to content

Commit 667b485

Browse files
YeeYoungHanYeeYoungHan
committed
"sip" 을 SIP_PROTOCOL 로 수정함
1 parent 429bd5a commit 667b485

12 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎KSipServer/SipServerUserAgent.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ void CSipServer::EventIncomingCall( const char * pszCallId, const char * pszFrom
200200
{
201201
CSipFrom clsContact;
202202

203-
clsContact.m_clsUri.m_strProtocol = "sip";
203+
clsContact.m_clsUri.m_strProtocol = SIP_PROTOCOL;
204204
clsContact.m_clsUri.m_strUser = clsXmlUser.m_strCallForward;
205205
clsContact.m_clsUri.m_strHost = gclsSetup.m_strLocalIp;
206206
clsContact.m_clsUri.m_iPort = gclsSetup.m_iUdpPort;

‎KSipServer/UserMap.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ bool CUserMap::Insert( CSipMessage * pclsMessage, CSipFrom * pclsContact, CXmlUs
9393

9494
if( pclsContact )
9595
{
96-
pclsContact->m_clsUri.m_strProtocol = "sip";
96+
pclsContact->m_clsUri.m_strProtocol = SIP_PROTOCOL;
9797
pclsContact->m_clsUri.m_strUser = strUserId;
9898
pclsContact->m_clsUri.m_strHost = clsInfo.m_strIp;
9999
pclsContact->m_clsUri.m_iPort = clsInfo.m_iPort;
@@ -307,12 +307,12 @@ void CUserMap::SendOptions( )
307307
if( pclsMessage == NULL ) break;
308308

309309
pclsMessage->m_strSipMethod = SIP_METHOD_OPTIONS;
310-
pclsMessage->m_clsReqUri.Set( "sip", itList->c_str(), clsUserInfo.m_strIp.c_str(), clsUserInfo.m_iPort );
310+
pclsMessage->m_clsReqUri.Set( SIP_PROTOCOL, itList->c_str(), clsUserInfo.m_strIp.c_str(), clsUserInfo.m_iPort );
311311

312-
pclsMessage->m_clsFrom.m_clsUri.Set( "sip", "ksipserver", gclsSetup.m_strLocalIp.c_str() );
312+
pclsMessage->m_clsFrom.m_clsUri.Set( SIP_PROTOCOL, "ksipserver", gclsSetup.m_strLocalIp.c_str() );
313313
pclsMessage->m_clsFrom.InsertTag();
314314

315-
pclsMessage->m_clsTo.m_clsUri.Set( "sip", itList->c_str(), clsUserInfo.m_strIp.c_str(), clsUserInfo.m_iPort );
315+
pclsMessage->m_clsTo.m_clsUri.Set( SIP_PROTOCOL, itList->c_str(), clsUserInfo.m_strIp.c_str(), clsUserInfo.m_iPort );
316316

317317
pclsMessage->m_clsCallId.Make( gclsSetup.m_strLocalIp.c_str() );
318318

‎McuControlServer/SipDialog.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ CSipMessage * CSipDialog::CreateMessage( const char * pszSipMethod )
182182
}
183183
else
184184
{
185-
pclsMessage->m_clsReqUri.Set( "sip", m_strToId.c_str(), m_strContactIp.c_str(), m_iContactPort );
185+
pclsMessage->m_clsReqUri.Set( SIP_PROTOCOL, m_strToId.c_str(), m_strContactIp.c_str(), m_iContactPort );
186186
}
187187

188188
if( strcmp( pszSipMethod, SIP_METHOD_ACK ) && strcmp( pszSipMethod, SIP_METHOD_CANCEL ) )
@@ -191,10 +191,10 @@ CSipMessage * CSipDialog::CreateMessage( const char * pszSipMethod )
191191
}
192192
pclsMessage->m_clsCSeq.Set( m_iSeq, pszSipMethod );
193193

194-
pclsMessage->m_clsFrom.m_clsUri.Set( "sip", m_strFromId.c_str(), gclsSipStack.m_clsSetup.m_strLocalIp.c_str(), gclsSipStack.m_clsSetup.m_iLocalUdpPort );
194+
pclsMessage->m_clsFrom.m_clsUri.Set( SIP_PROTOCOL, m_strFromId.c_str(), gclsSipStack.m_clsSetup.m_strLocalIp.c_str(), gclsSipStack.m_clsSetup.m_iLocalUdpPort );
195195
pclsMessage->m_clsFrom.InsertParam( SIP_TAG, m_strFromTag.c_str() );
196196

197-
pclsMessage->m_clsTo.m_clsUri.Set( "sip", m_strToId.c_str(), m_strContactIp.c_str(), m_iContactPort );
197+
pclsMessage->m_clsTo.m_clsUri.Set( SIP_PROTOCOL, m_strToId.c_str(), m_strContactIp.c_str(), m_iContactPort );
198198
if( m_strToTag.empty() == false )
199199
{
200200
pclsMessage->m_clsTo.InsertParam( SIP_TAG, m_strToTag.c_str() );

‎McuControlServer/UserMap.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ bool CUserMap::Insert( CSipMessage * pclsMessage, CSipFrom * pclsContact )
6161

6262
if( pclsContact )
6363
{
64-
pclsContact->m_clsUri.m_strProtocol = "sip";
64+
pclsContact->m_clsUri.m_strProtocol = SIP_PROTOCOL;
6565
pclsContact->m_clsUri.m_strUser = strUserId;
6666
pclsContact->m_clsUri.m_strHost = clsInfo.m_strIp;
6767
pclsContact->m_clsUri.m_iPort = clsInfo.m_iPort;

‎SimpleSipServer/UserMap.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ bool CUserMap::Insert( CSipMessage * pclsMessage, CSipFrom * pclsContact )
6060

6161
if( pclsContact )
6262
{
63-
pclsContact->m_clsUri.m_strProtocol = "sip";
63+
pclsContact->m_clsUri.m_strProtocol = SIP_PROTOCOL;
6464
pclsContact->m_clsUri.m_strUser = strUserId;
6565
pclsContact->m_clsUri.m_strHost = clsInfo.m_strIp;
6666
pclsContact->m_clsUri.m_iPort = clsInfo.m_iPort;

‎SipParser/SipUri.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ void CSipUri::Set( const char * pszProtocol, const char * pszUser, const char *
231231
}
232232
else
233233
{
234-
m_strProtocol = "sip";
234+
m_strProtocol = SIP_PROTOCOL;
235235
}
236236

237237
if( pszUser )

‎SipSpeed/SipTestSipOptions.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ static CSipMessage * CreateSipMessage( )
4545
pclsMessage->m_eTransport = E_SIP_UDP;
4646
pclsMessage->m_strSipMethod = SIP_METHOD_OPTIONS;
4747

48-
pclsMessage->m_clsReqUri.Set( "sip", gclsSetup.m_strCalleeId.c_str(), gclsSetup.m_strSipDomain.c_str(), gclsSetup.m_iSipServerPort );
48+
pclsMessage->m_clsReqUri.Set( SIP_PROTOCOL, gclsSetup.m_strCalleeId.c_str(), gclsSetup.m_strSipDomain.c_str(), gclsSetup.m_iSipServerPort );
4949

5050
pclsMessage->m_clsCSeq.Set( 1, SIP_METHOD_OPTIONS );
5151

52-
pclsMessage->m_clsFrom.m_clsUri.Set( "sip", gclsSetup.m_strCallerId.c_str(), gclsSetup.m_strSipDomain.c_str(), gclsSetup.m_iSipServerPort );
52+
pclsMessage->m_clsFrom.m_clsUri.Set( SIP_PROTOCOL, gclsSetup.m_strCallerId.c_str(), gclsSetup.m_strSipDomain.c_str(), gclsSetup.m_iSipServerPort );
5353
pclsMessage->m_clsFrom.InsertParam( SIP_TAG, szTag );
5454

55-
pclsMessage->m_clsTo.m_clsUri.Set( "sip", gclsSetup.m_strCalleeId.c_str(), gclsSetup.m_strSipDomain.c_str(), gclsSetup.m_iSipServerPort );
55+
pclsMessage->m_clsTo.m_clsUri.Set( SIP_PROTOCOL, gclsSetup.m_strCalleeId.c_str(), gclsSetup.m_strSipDomain.c_str(), gclsSetup.m_iSipServerPort );
5656

5757
// Route
5858
pclsMessage->AddRoute( gclsSetup.m_strSipServerIp.c_str(), gclsSetup.m_iSipServerPort, E_SIP_UDP );

‎SipStack/SipStackComm.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ void CSipStack::CheckSipMessage( CSipMessage * pclsMessage )
452452

453453
CSipFrom clsContact;
454454

455-
clsContact.m_clsUri.m_strProtocol = "sip";
455+
clsContact.m_clsUri.m_strProtocol = SIP_PROTOCOL;
456456

457457
if( pclsMessage->IsRequest() )
458458
{

‎SipUserAgent/SipDialog.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ CSipMessage * CSipDialog::CreateMessage( const char * pszSipMethod )
414414
}
415415
else
416416
{
417-
pclsMessage->m_clsReqUri.Set( "sip", m_strToId.c_str(), m_strContactIp.c_str(), m_iContactPort );
417+
pclsMessage->m_clsReqUri.Set( SIP_PROTOCOL, m_strToId.c_str(), m_strContactIp.c_str(), m_iContactPort );
418418
pclsMessage->m_clsReqUri.InsertTransport( m_eTransport );
419419
}
420420

@@ -445,10 +445,10 @@ CSipMessage * CSipDialog::CreateMessage( const char * pszSipMethod )
445445

446446
pclsMessage->m_clsCSeq.Set( iSeq, pszSipMethod );
447447

448-
pclsMessage->m_clsFrom.m_clsUri.Set( "sip", m_strFromId.c_str(), m_pclsSipStack->m_clsSetup.m_strLocalIp.c_str(), m_pclsSipStack->m_clsSetup.m_iLocalUdpPort );
448+
pclsMessage->m_clsFrom.m_clsUri.Set( SIP_PROTOCOL, m_strFromId.c_str(), m_pclsSipStack->m_clsSetup.m_strLocalIp.c_str(), m_pclsSipStack->m_clsSetup.m_iLocalUdpPort );
449449
pclsMessage->m_clsFrom.InsertParam( SIP_TAG, m_strFromTag.c_str() );
450450

451-
pclsMessage->m_clsTo.m_clsUri.Set( "sip", m_strToId.c_str(), m_strContactIp.c_str(), m_iContactPort );
451+
pclsMessage->m_clsTo.m_clsUri.Set( SIP_PROTOCOL, m_strToId.c_str(), m_strContactIp.c_str(), m_iContactPort );
452452
if( m_strToTag.empty() == false )
453453
{
454454
pclsMessage->m_clsTo.InsertParam( SIP_TAG, m_strToTag.c_str() );

‎SipUserAgent/SipServerInfo.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ CSipMessage * CSipServerInfo::CreateRegister( CSipStack * pclsSipStack, CSipMess
110110

111111
// REGISTER sip:127.0.0.1 SIP/2.0
112112
pclsRequest->m_strSipMethod = SIP_METHOD_REGISTER;
113-
pclsRequest->m_clsReqUri.Set( "sip", NULL, m_strDomain.c_str(), m_iPort );
113+
pclsRequest->m_clsReqUri.Set( SIP_PROTOCOL, NULL, m_strDomain.c_str(), m_iPort );
114114

115115
// To
116-
pclsRequest->m_clsTo.m_clsUri.Set( "sip", m_strUserId.c_str(), m_strDomain.c_str(), m_iPort );
116+
pclsRequest->m_clsTo.m_clsUri.Set( SIP_PROTOCOL, m_strUserId.c_str(), m_strDomain.c_str(), m_iPort );
117117

118118
// From
119119
pclsRequest->m_clsFrom = pclsRequest->m_clsTo;

0 commit comments

Comments
 (0)