From aa1e334cd93c08b0dfb71c46264ee63d6dbe0097 Mon Sep 17 00:00:00 2001 From: Kurtis Heimerl Date: Tue, 11 Dec 2012 06:11:23 +0000 Subject: [PATCH] r4605 in private: Make the sending of 100 Trying optional for SIP MESSAGE, even though it violates RFC3428. Closes #1194. git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@4613 19bc5d8c-e614-43d4-8b26-e1612bc8e597 --- SIP/SIPInterface.cpp | 4 +++- apps/OpenBTS.example.sql | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/SIP/SIPInterface.cpp b/SIP/SIPInterface.cpp index 511b346..747464d 100644 --- a/SIP/SIPInterface.cpp +++ b/SIP/SIPInterface.cpp @@ -468,7 +468,9 @@ bool SIPInterface::checkInvite( osip_message_t * msg) } // Send trying, if appropriate. - if (serviceType!=L3CMServiceType::MobileTerminatedShortMessage) transaction->MTCSendTrying(); + bool sendTrying = serviceType!=L3CMServiceType::MobileTerminatedShortMessage; + sendTrying = sendTrying || !gConfig.getBool("SIP.RFC3428.NoTrying"); + if (sendTrying) transaction->MTCSendTrying(); // And if no channel is established yet, page again. if (!chan) { diff --git a/apps/OpenBTS.example.sql b/apps/OpenBTS.example.sql index a8cc16a..5be10db 100644 --- a/apps/OpenBTS.example.sql +++ b/apps/OpenBTS.example.sql @@ -94,6 +94,7 @@ INSERT INTO "CONFIG" VALUES('Log.Level.SMSControl.cpp','INFO',0,1,'Default confi INSERT INTO "CONFIG" VALUES('NTP.Server','pool.ntp.org',0,1,'NTP server(s) for time-of-day clock syncing. For multiple servers, use a space-delimited list. If left undefined, NTP will not be used, but it is strongly recommended.'); INSERT INTO "CONFIG" VALUES('RTP.Range','98',1,0,'Range of RTP port pool. Pool is RTP.Start to RTP.Range-1. Static.'); INSERT INTO "CONFIG" VALUES('RTP.Start','16484',1,0,'Base of RTP port pool. Pool is RTP.Start to RTP.Range-1. Static.'); +INSERT INTO "CONFIG" VALUES('SIP.RFC3428.NoTrying','0',0,1,'If NULL or 0, send 100 Trying response to SIP MESSAGE, even though that violates RFC-3428. In other words, to actually comply with the RFC, set this to something other than NULL or 0'); INSERT INTO "CONFIG" VALUES('SIP.DTMF.RFC2833','1',0,1,'If not NULL, use RFC-2833 (RTP event signalling) for in-call DTMF.'); INSERT INTO "CONFIG" VALUES('SIP.DTMF.RFC2833.PayloadType','101',0,1,'Payload type to use for RFC-2833 telephone event packets. If SIP.DTMF.2833 is defined, this must also be defined.'); INSERT INTO "CONFIG" VALUES('SIP.DTMF.RFC2967',NULL,0,1,'If not NULL, use RFC-2967 (SIP INFO method) for in-call DTMF.');