From bd0a6fc6a99577b0eeab5b56a85e28eb0cff2ed8 Mon Sep 17 00:00:00 2001
From: paulc <paulc@acf43c95-373e-0410-b603-e72c3f656dc1>
Date: Sat, 1 May 2010 18:38:03 +0000
Subject: [PATCH] Allow specifying a default SLS for outbound calls in the ISUP
 settings (reloadable).

git-svn-id: http://voip.null.ro/svn/yate@3265 acf43c95-373e-0410-b603-e72c3f656dc1
---
 conf.d/ysigchan.conf.sample |  8 ++++++++
 libs/ysig/isup.cpp          | 32 ++++++++++++++++++++++++++++++--
 libs/ysig/yatesig.h         |  1 +
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/conf.d/ysigchan.conf.sample b/conf.d/ysigchan.conf.sample
index 4037f66e..def2195f 100644
--- a/conf.d/ysigchan.conf.sample
+++ b/conf.d/ysigchan.conf.sample
@@ -293,6 +293,14 @@
 ; Defaults to minimum value (60s) if missing or invalid
 ;channelsync=1000
 
+; sls: integer or keyword: Default Signaling Link Selection in outbound calls
+; Allowed values:
+;    auto    Let SS7 Layer3 add a proper value
+;    last    Last SLS used (default)
+;    cic     Use the circuit number as SLS (ITU style)
+;    0..255  Explicit numeric value, gets truncated to the SLS bit range
+;sls=auto
+
 ; numplan: string: Default numbering plan for outgoing calls
 ; Values: unknown, isdn, data, telex, national, private
 ; Defaults to unknown if missing or incorrect
diff --git a/libs/ysig/isup.cpp b/libs/ysig/isup.cpp
index 04127772..5b0aac0a 100644
--- a/libs/ysig/isup.cpp
+++ b/libs/ysig/isup.cpp
@@ -158,6 +158,14 @@ static const SignallingFlags s_flags_paramcompat[] = {
 // Backward call indicators to be copied
 static const String s_copyBkInd("BackwardCallIndicators,OptionalBackwardCallIndicators");
 
+// SLS special values on outbound calls
+static const TokenDict s_dict_callSls[] = {
+    { "auto", -1 }, // Let Layer3 deal with it
+    { "last", -2 }, // Last SLS used
+    { "cic",  -3 }, // Lower bits of CIC
+    { 0, 0 }
+};
+
 // Control operations
 static const TokenDict s_dict_control[] = {
     { "validate", SS7MsgISUP::CVT },
@@ -2432,6 +2440,7 @@ SS7ISUP::SS7ISUP(const NamedList& params)
       m_sls(255),
       m_earlyAcm(true),
       m_inn(false),
+      m_defaultSls(-2),
       m_l3LinkUp(false),
       m_uptTimer(0),
       m_userPartAvail(true),
@@ -2513,6 +2522,7 @@ SS7ISUP::SS7ISUP(const NamedList& params)
 	m_userPartAvail = false;
 
     m_continuity = params.getValue("continuity");
+    m_defaultSls = params.getIntValue("sls",s_dict_callSls,m_defaultSls);
 
     setDebug(params.getBoolValue("print-messages",false),
 	params.getBoolValue("extended-debug",false));
@@ -2533,6 +2543,12 @@ SS7ISUP::SS7ISUP(const NamedList& params)
 	s << " lockcircuits=" << params.getValue("lockcircuits");
 	s << " userpartavail=" << String::boolText(m_userPartAvail);
 	s << " lockgroup=" << String::boolText(m_lockGroup);
+	const char* sls = lookup(m_defaultSls,s_dict_callSls);
+	s << " outboundsls=";
+	if (sls)
+	    s << sls;
+	else
+	    s << m_defaultSls;
 	if (m_continuity)
 	    s << " continuity=" << m_continuity;
 	Debug(this,DebugInfo,"ISUP Call Controller %s [%p]",s.c_str(),this);
@@ -2563,6 +2579,7 @@ bool SS7ISUP::initialize(const NamedList* config)
 	m_lockGroup = config->getBoolValue("lockgroup",m_lockGroup);
 	m_earlyAcm = config->getBoolValue("earlyacm",m_earlyAcm);
 	m_continuity = config->getValue("continuity",m_continuity);
+	m_defaultSls = config->getIntValue("sls",s_dict_callSls,m_defaultSls);
     }
     if (engine() && !network()) {
 	NamedList params("ss7router");
@@ -2712,8 +2729,19 @@ SignallingCall* SS7ISUP::call(SignallingMessage* msg, String& reason)
 	    if (p)
 		cic->setParams(*p);
 	}
-	call = new SS7ISUPCall(this,cic,*m_defPoint,dest,true,
-	    msg->params().getIntValue("sls",-1),range);
+	int sls = msg->params().getIntValue("sls",s_dict_callSls,m_defaultSls);
+	switch (sls) {
+	    case -3:
+		if (cic) {
+		    sls = cic->code();
+		    break;
+		}
+		// fall through
+	    case -2:
+		sls = m_sls;
+		break;
+	}
+	call = new SS7ISUPCall(this,cic,*m_defPoint,dest,true,sls,range);
 	call->ref();
 	m_calls.append(call);
 	SignallingEvent* event = new SignallingEvent(SignallingEvent::NewCall,msg,call);
diff --git a/libs/ysig/yatesig.h b/libs/ysig/yatesig.h
index fa681f79..9b00b1c9 100644
--- a/libs/ysig/yatesig.h
+++ b/libs/ysig/yatesig.h
@@ -6290,6 +6290,7 @@ private:
     unsigned char m_sls;                 // Last known valid SLS
     bool m_earlyAcm;                     // Accept progress/ringing in early ACM
     bool m_inn;                          // Routing to internal network number flag
+    int m_defaultSls;                    // Default SLS to use in outbound calls
     String m_numPlan;                    // Numbering plan
     String m_numType;                    // Number type
     String m_numPresentation;            // Number presentation