Module: sems Branch: master Commit: 54657bf95c10b0af480f46ece5787baa526bbff6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=54657bf95c10b0af480f46ece5787baa526bbff6
Author: Raphael Coeffic <[email protected]> Committer: Raphael Coeffic <[email protected]> Date: Sun Feb 13 15:29:59 2011 +0100 adds a method to dump the configured interfaces. --- core/AmConfig.cpp | 43 ++++++++++++++++++++++++++++++------------- core/AmConfig.h | 4 ++++ 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/core/AmConfig.cpp b/core/AmConfig.cpp index b1a7681..d35d793 100644 --- a/core/AmConfig.cpp +++ b/core/AmConfig.cpp @@ -546,6 +546,7 @@ static int readInterface(AmConfigReader& cfg, const string& i_name) } } + intf.name = i_name; AmConfig::Ifs.push_back(intf); AmConfig::LocalSIPIP2If.insert(std::make_pair(intf.LocalSIPIP, AmConfig::Ifs.size()-1)); @@ -584,21 +585,37 @@ static int readInterfaces(AmConfigReader& cfg) //debug if(ret != -1) { - for(map<string,unsigned short>::iterator it = AmConfig::If_names.begin(); - it != AmConfig::If_names.end(); it++) { - - DBG("BEGIN: interface: '%s'",it->first.c_str()); - - AmConfig::IP_interface& it_ref = AmConfig::Ifs[it->second]; - DBG("\tLocalIP='%s'",it_ref.LocalIP.c_str()); - DBG("\tPublicIP='%s'",it_ref.PublicIP.c_str()); - DBG("\tLocalSIPIP='%s'",it_ref.LocalSIPIP.c_str()); - DBG("\tLocalSIPPort=%u",it_ref.LocalSIPPort); - DBG("\tRtpLowPort=%u",it_ref.RtpLowPort); - DBG("\tRtpHighPort=%u",it_ref.RtpHighPort); - } + AmConfig::dump_Ifs(); } return ret; } +void AmConfig::dump_Ifs() +{ + for(map<string,unsigned short>::iterator it = If_names.begin(); + it != If_names.end(); it++) { + + INFO("Interface: '%s'",it->first.c_str()); + + IP_interface& it_ref = Ifs[it->second]; + INFO("\tLocalIP='%s'",it_ref.LocalIP.c_str()); + INFO("\tPublicIP='%s'",it_ref.PublicIP.c_str()); + INFO("\tLocalSIPIP='%s'",it_ref.LocalSIPIP.c_str()); + INFO("\tLocalSIPPort=%u",it_ref.LocalSIPPort); + INFO("\tRtpLowPort=%u",it_ref.RtpLowPort); + INFO("\tRtpHighPort=%u",it_ref.RtpHighPort); + } + + INFO("Signaling address map:"); + for(multimap<string,unsigned short>::iterator it = LocalSIPIP2If.begin(); + it != LocalSIPIP2If.end(); ++it) { + if(Ifs[it->second].name.empty()){ + INFO("\t%s -> default",it->first.c_str()); + } + else { + INFO("\t%s -> %s",it->first.c_str(), + Ifs[it->second].name.c_str()); + } + } +} diff --git a/core/AmConfig.h b/core/AmConfig.h index c3ec82e..a8b1a9d 100644 --- a/core/AmConfig.h +++ b/core/AmConfig.h @@ -80,6 +80,8 @@ struct AmConfig struct IP_interface { + string name; + /** local IP for SDP media advertising */ string LocalIP; @@ -102,6 +104,8 @@ struct AmConfig static map<string,unsigned short> If_names; static multimap<string,unsigned short> LocalSIPIP2If; + static void dump_Ifs(); + static string& LocalIP() { return (Ifs[0].LocalIP); } _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
