[sr-dev] git:master: snmpstats Clear upp method-supported logic a bit and add " dialog-ng" for call statefullness

[Olle E. Johansson]

Module: sip-router
Branch: master
Commit: bb76415ba7b623242a84b295728e61d307ab48fb
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb76415ba7b623242a84b295728e61d307ab48fb

Author: Olle E. Johansson <oej at edvina.net>
Committer: Olle E. Johansson <oej at edvina.net>
Date:   Sun Mar 24 11:45:43 2013 +0100

snmpstats Clear upp method-supported logic a bit and add "dialog-ng" for call statefullness

---

 modules/snmpstats/snmpSIPMethodSupportedTable.c |   20 +++++---------------
 modules/snmpstats/snmpSIPServerObjects.c        |    2 +-
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/modules/snmpstats/snmpSIPMethodSupportedTable.c b/modules/snmpstats/snmpSIPMethodSupportedTable.c
index 756dfce..92cc8b6 100644
--- a/modules/snmpstats/snmpSIPMethodSupportedTable.c
+++ b/modules/snmpstats/snmpSIPMethodSupportedTable.c
@@ -140,23 +140,16 @@ void init_kamailioSIPMethodSupportedTable(void)
 	 * NOTE: My way of checking what METHODS we support is probably wrong.
 	 * Please feel free to correct it! */
 	
-	if (module_loaded("sl")) {
-		createRow(1, "METHOD_INVITE");
-		createRow(2, "METHOD_CANCEL");
-		createRow(3, "METHOD_ACK");
-	}
-
-	if (module_loaded("tm")) {
-		createRow(4, "METHOD_BYE");
-	}
+	createRow(1, "METHOD_INVITE");
+	createRow(2, "METHOD_CANCEL");
+	createRow(3, "METHOD_ACK");
+	createRow(4, "METHOD_BYE");
 
 	if (module_loaded("options") || module_loaded("siputils")) {
 		createRow(6, "METHOD_OPTIONS");
 	}
 
-	if (module_loaded("dialog")) {
-		createRow(7, "METHOD_UPDATE");
-	}
+	createRow(7, "METHOD_UPDATE");
 
 	if (module_loaded("registrar")) {
 		createRow(8, "METHOD_REGISTER");
@@ -166,9 +159,6 @@ void init_kamailioSIPMethodSupportedTable(void)
 
 	createRow(5,  "METHOD_INFO");
 	createRow(9,  "METHOD_MESSAGE");
-
-	/* I'm not sure what these guys are, so saying we support them by
-	 * default.  */
 	createRow(12, "METHOD_PRACK");
 	createRow(13, "METHOD_REFER");
 	createRow(14, "METHOD_PUBLISH");
diff --git a/modules/snmpstats/snmpSIPServerObjects.c b/modules/snmpstats/snmpSIPServerObjects.c
index 07e64e4..4ab497d 100644
--- a/modules/snmpstats/snmpSIPServerObjects.c
+++ b/modules/snmpstats/snmpSIPServerObjects.c
@@ -196,7 +196,7 @@ int handle_kamailioSIPProxyStatefulness(netsnmp_mib_handler *handler,
 {
 	int statefullness;
 
-	if (module_loaded("dialog")) 
+	if (module_loaded("dialog") || module_loaded("dialog_ng")) 
 	{
 		statefullness = PROXY_STATEFULNESS_CALL_STATEFUL;
 	}