瀏覽代碼

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

Olle E. Johansson 12 年之前
父節點
當前提交
bb76415ba7
共有 2 個文件被更改,包括 6 次插入16 次删除
  1. 5 15
      modules/snmpstats/snmpSIPMethodSupportedTable.c
  2. 1 1
      modules/snmpstats/snmpSIPServerObjects.c

+ 5 - 15
modules/snmpstats/snmpSIPMethodSupportedTable.c

@@ -140,23 +140,16 @@ void init_kamailioSIPMethodSupportedTable(void)
 	 * NOTE: My way of checking what METHODS we support is probably wrong.
 	 * NOTE: My way of checking what METHODS we support is probably wrong.
 	 * Please feel free to correct it! */
 	 * 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")) {
 	if (module_loaded("options") || module_loaded("siputils")) {
 		createRow(6, "METHOD_OPTIONS");
 		createRow(6, "METHOD_OPTIONS");
 	}
 	}
 
 
-	if (module_loaded("dialog")) {
-		createRow(7, "METHOD_UPDATE");
-	}
+	createRow(7, "METHOD_UPDATE");
 
 
 	if (module_loaded("registrar")) {
 	if (module_loaded("registrar")) {
 		createRow(8, "METHOD_REGISTER");
 		createRow(8, "METHOD_REGISTER");
@@ -166,9 +159,6 @@ void init_kamailioSIPMethodSupportedTable(void)
 
 
 	createRow(5,  "METHOD_INFO");
 	createRow(5,  "METHOD_INFO");
 	createRow(9,  "METHOD_MESSAGE");
 	createRow(9,  "METHOD_MESSAGE");
-
-	/* I'm not sure what these guys are, so saying we support them by
-	 * default.  */
 	createRow(12, "METHOD_PRACK");
 	createRow(12, "METHOD_PRACK");
 	createRow(13, "METHOD_REFER");
 	createRow(13, "METHOD_REFER");
 	createRow(14, "METHOD_PUBLISH");
 	createRow(14, "METHOD_PUBLISH");

+ 1 - 1
modules/snmpstats/snmpSIPServerObjects.c

@@ -196,7 +196,7 @@ int handle_kamailioSIPProxyStatefulness(netsnmp_mib_handler *handler,
 {
 {
 	int statefullness;
 	int statefullness;
 
 
-	if (module_loaded("dialog")) 
+	if (module_loaded("dialog") || module_loaded("dialog_ng")) 
 	{
 	{
 		statefullness = PROXY_STATEFULNESS_CALL_STATEFUL;
 		statefullness = PROXY_STATEFULNESS_CALL_STATEFUL;
 	}
 	}