From 332ce25dbec24507947dd52c7374f2bf3a4f2890 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Fri, 30 Aug 2013 10:35:57 +0200
Subject: mgw_nat_usr / sctp_handler: Allow specification of local IP+Port

---
 src/mgw_nat_usr.erl  | 10 +++++++---
 src/sctp_handler.erl | 18 +++++++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/mgw_nat_usr.erl b/src/mgw_nat_usr.erl
index f19491a..900b844 100644
--- a/src/mgw_nat_usr.erl
+++ b/src/mgw_nat_usr.erl
@@ -55,13 +55,17 @@ init(Params) ->
 	MscLocalIp = get_cfg_pl_val(msc_local_ip, Params),
 	MscLocalPort = get_cfg_pl_val(msc_local_port, Params),
 	MscRemoteIp = get_cfg_pl_val(msc_remote_ip, Params),
+	StpLocalIp = proplists:get_value(stp_local_ip, Params),
+	StpLocalPort = proplists:get_value(stp_local_port, Params),
 	StpRemoteIp = get_cfg_pl_val(stp_remote_ip, Params),
 	StpRemotePort = get_cfg_pl_val(stp_remote_port, Params),
 	RewriteActMod = get_cfg_pl_val(rewrite_act_mod, Params),
 	RewriteActMod:reload_config(),
-	SctpHdlrArgs =	[MscLocalIp, MscLocalPort, MscRemoteIp,
-			 StpRemoteIp, StpRemotePort, RewriteActMod],
-	{ok, LoopDat} = apply(sctp_handler, init, SctpHdlrArgs),
+	SctpHdlrArgs = [
+		{msc, {{MscLocalIp, MscLocalPort}, MscRemoteIp}},
+		{stp, {{StpLocalIp, StpLocalPort}, {StpRemoteIp, StpRemotePort}}}
+	],
+	{ok, LoopDat} = apply(sctp_handler, init, [SctpHdlrArgs, RewriteActMod]),
 	{ok, {Params, LoopDat}}.
 
 % this cast is produced by mgw_nat_sup child walker
diff --git a/src/sctp_handler.erl b/src/sctp_handler.erl
index 2560d7a..a5581de 100644
--- a/src/sctp_handler.erl
+++ b/src/sctp_handler.erl
@@ -35,7 +35,7 @@
 
 -module(sctp_handler).
 -author("Harald Welte <laforge@gnumonks.org>").
--export([init/6, handle_sctp/2]).
+-export([init/2, handle_sctp/2]).
 
 -include_lib("kernel/include/inet.hrl").
 -include_lib("kernel/include/inet_sctp.hrl").
@@ -54,14 +54,26 @@
 
 -define(COMMON_SOCKOPTS, [{active, once}, {reuseaddr, true}, {sctp_nodelay, true}]).
 
+opts2local_stp(OptList) ->
+	opts2local_stp(OptList, []).
+opts2local_stp([], L) ->
+	L;
+opts2local_stp([{stp, {{Ip, Port}, _}}|Tail], L) ->
+	opts2local_stp(Tail, [{ip, Ip}, {port, Port}] ++ L);
+opts2local_stp([_|Tail], L) ->
+	opts2local_stp(Tail, L).
+
 % initialize the sockets towards MSC (listening) and STP (connect)
-init(MscLocalIP, MscLocalPort, MscRemoteIP, StpRemoteIP, StpRemotePort, RewriteActMod) ->
+init(Options, RewriteActMod) when is_list(Options) ->
+	{{MscLocalIP, MscLocalPort}, MscRemoteIP} = proplists:get_value(msc, Options),
+	{_, {StpRemoteIP, StpRemotePort}} = proplists:get_value(stp, Options),
 	{ok, MscSock} = gen_sctp:open([{ip, MscLocalIP},{port,MscLocalPort}]
 					++ ?COMMON_SOCKOPTS),
 	io:format("Listening for MSC on ~w:~w. ~w~n",
 			[MscLocalIP, MscLocalPort, MscSock]),
 	ok = gen_sctp:listen(MscSock, true),
-	{ok, StpSock} = gen_sctp:open(?COMMON_SOCKOPTS),
+	LocalSockOpts = opts2local_stp(Options),
+	{ok, StpSock} = gen_sctp:open(LocalSockOpts ++ ?COMMON_SOCKOPTS),
 	L = #loop_data{msc_sock = MscSock, msc_local_ip = MscLocalIP, 
 			msc_remote_ip = MscRemoteIP,
 			stp_sock = StpSock, stp_remote_ip = StpRemoteIP,
-- 
cgit v1.2.3