snmpstats(k) Change from OpenSER to Kamailio

Note: Apart from code name changes, the MIB files and the objects
has changed names. This will affect all systems monitoring your
SIP server as you upgrade to 4.0.0

modules_k/snmpstats/Makefile

@@ -30,5 +30,5 @@ include ../../Makefile.modules
 install_module_custom:
 	echo "installing mibs ..."
 	mkdir -p $(INSTALLMIBDIR)
-	$(INSTALL_CFG) mibs/OPENSER* $(INSTALLMIBDIR)
+	$(INSTALL_CFG) mibs/KAMAILIO* $(INSTALLMIBDIR)
 

modules_k/snmpstats/README

@@ -116,50 +116,54 @@ Chapter 1. Admin Guide
    1.2. SNMP Tables
    1.3. Alarm Monitoring
 
-   The SNMPStats module provides an SNMP management interface to OpenSER.
+   The SNMPStats module provides an SNMP management interface to Kamailio.
    Specifically, it provides general SNMP queryable scalar statistics,
    table representations of more complicated data such as user and contact
    information, and alarm monitoring capabilities.
 
+   The MIB has been renamed in version 4.0.0 to reflect the product name.
+   Please note that all the OID names has changed, as well as the MIB
+   itself.
+
 1.1. General Scalar Statistics
 
    The SNMPStats module provides a number of general scalar statistics.
-   Details are available in OPENSER-MIB, OPENSER-REG-MIB,
-   OPENSER-SIP-COMMON-MIB, and OPENSER-SIP-SERVER-MIB. But briefly, these
-   scalars are:
-
-   openserSIPProtocolVersion, openserSIPServiceStartTime,
-   openserSIPEntityType, openserSIPSummaryInRequests,
-   openserSIPSummaryOutRequest, openserSIPSummaryInResponses,
-   openserSIPSummaryOutResponses, openserSIPSummaryTotalTransactions,
-   openserSIPCurrentTransactions, openserSIPNumUnsupportedUris,
-   openserSIPNumUnsupportedMethods, openserSIPOtherwiseDiscardedMsgs,
-   openserSIPProxyStatefulness openserSIPProxyRecordRoute,
-   openserSIPProxyAuthMethod, openserSIPNumProxyRequireFailures,
-   openserSIPRegMaxContactExpiryDuration, openserSIPRegMaxUsers,
-   openserSIPRegCurrentUsers, openserSIPRegDfltRegActiveInterval,
-   openserSIPRegAcceptedRegistrations, openserSIPRegRejectedRegistrations,
-   openserMsgQueueDepth. openserCurNumDialogs,
-   openserCurNumDialogsInProgress, openserCurNumDialogsInSetup,
-   openserTotalNumFailedDialogSetups
+   Details are available in KAMAILIO-MIB, KAMAILIO-REG-MIB,
+   KAMAILIO-SIP-COMMON-MIB, and KAMAILIO-SIP-SERVER-MIB. But briefly,
+   these scalars are:
+
+   kamailioSIPProtocolVersion, kamailioSIPServiceStartTime,
+   kamailioSIPEntityType, kamailioSIPSummaryInRequests,
+   kamailioSIPSummaryOutRequest, kamailioSIPSummaryInResponses,
+   kamailioSIPSummaryOutResponses, kamailioSIPSummaryTotalTransactions,
+   kamailioSIPCurrentTransactions, kamailioSIPNumUnsupportedUris,
+   kamailioSIPNumUnsupportedMethods, kamailioSIPOtherwiseDiscardedMsgs,
+   kamailioSIPProxyStatefulness kamailioSIPProxyRecordRoute,
+   kamailioSIPProxyAuthMethod, kamailioSIPNumProxyRequireFailures,
+   kamailioSIPRegMaxContactExpiryDuration, kamailioSIPRegMaxUsers,
+   kamailioSIPRegCurrentUsers, kamailioSIPRegDfltRegActiveInterval,
+   kamailioSIPRegAcceptedRegistrations,
+   kamailioSIPRegRejectedRegistrations, kamailioMsgQueueDepth.
+   kamailioCurNumDialogs, kamailioCurNumDialogsInProgress,
+   kamailioCurNumDialogsInSetup, kamailioTotalNumFailedDialogSetups
 
    There are also scalars associated with alarms. They are as follows:
 
-   openserMsgQueueMinorThreshold, openserMsgQueueMajorThreshold,
-   openserMsgQueueDepthAlarmStatus, openserMsgQueueDepthMinorAlarm,
-   openserMsgQueueDepthMajorAlarm, openserDialogLimitMinorThreshold,
-   openserDialogLimitMajorThreshold, openserDialogUsageState,
-   openserDialogLimitAlarmStatus, openserDialogLimitMinorAlarm,
-   openserDialogLimitMajorAlarm
+   kamailioMsgQueueMinorThreshold, kamailioMsgQueueMajorThreshold,
+   kamailioMsgQueueDepthAlarmStatus, kamailioMsgQueueDepthMinorAlarm,
+   kamailioMsgQueueDepthMajorAlarm, kamailioDialogLimitMinorThreshold,
+   kamailioDialogLimitMajorThreshold, kamailioDialogUsageState,
+   kamailioDialogLimitAlarmStatus, kamailioDialogLimitMinorAlarm,
+   kamailioDialogLimitMajorAlarm
 
 1.2. SNMP Tables
 
    The SNMPStats module provides several tables, containing more
    complicated data. The current available tables are:
 
-   openserSIPPortTable, openserSIPMethodSupportedTable,
-   openserSIPStatusCodesTable, openserSIPRegUserTable,
-   openserSIPContactTable, openserSIPRegUserLookupTable
+   kamailioSIPPortTable, kamailioSIPMethodSupportedTable,
+   kamailioSIPStatusCodesTable, kamailioSIPRegUserTable,
+   kamailioSIPContactTable, kamailioSIPRegUserLookupTable
 
 1.3. Alarm Monitoring
 
@@ -170,20 +174,22 @@ Chapter 1. Admin Guide
        their SIP servers may be overloaded, without having to explicitly
        check for this condition.
        If a minor or major condition has occured, then a
-       openserDialogLimitMinorEvent trap or a openserDialogLimitMajorEvent
-       trap will be generated, respectively. The minor and major
-       thresholds are described in the parameters section below.
-    2. The number of bytes waiting to be consumed across all of OpenSERs
+       kamailioDialogLimitMinorEvent trap or a
+       kamailioDialogLimitMajorEvent trap will be generated, respectively.
+       The minor and major thresholds are described in the parameters
+       section below.
+    2. The number of bytes waiting to be consumed across all of Kamailios
        listening ports has passed a minor or major threshold. The idea is
        that a network operation centre can be made aware that a machine
        hosting a SIP server may be entering a degraded state, and to
        investigate why this is so.
        If the number of bytes to be consumed passes a minor or major
-       threshold, then a openserMsgQueueDepthMinorEvent or
-       openserMsgQueueDepthMajorEvent trap will be sent out, respectively.
+       threshold, then a kamailioMsgQueueDepthMinorEvent or
+       kamailioMsgQueueDepthMajorEvent trap will be sent out,
+       respectively.
 
    Full details of these traps can be found in the distributions
-   OPENSER-MIB file.
+   KAMAILIO-MIB file.
 
 2. How it works
 
@@ -192,15 +198,15 @@ Chapter 1. Admin Guide
 
 2.1. How the SNMPStats module gets its data
 
-   The SNMPStats module uses OpenSERs internal statistic framework to
+   The SNMPStats module uses Kamailios internal statistic framework to
    collect most of its data. However, there are two exceptions.
-    1. The openserSIPRegUserTable and openserSIPContactTable rely on the
+    1. The kamailioSIPRegUserTable and kamailioSIPContactTable rely on the
        usrloc modules callback system. Specifically, the SNMPStats module
        will receive callbacks whenever a user/contact is added to the
        system.
-    2. The SNMPStats modules openserSIPMsgQueueDepthMinorEvent and
-       openserSIPMsgQueueDepthMajorEvent alarms rely on the OpenSER core
-       to find out what interfaces, ports, and transports OpenSER is
+    2. The SNMPStats modules kamailioSIPMsgQueueDepthMinorEvent and
+       kamailioSIPMsgQueueDepthMajorEvent alarms rely on the Kamailio core
+       to find out what interfaces, ports, and transports Kamailio is
        listening on. However, the module will actually query the proc file
        system to find out the number of bytes waiting to be consumed.
        (Currently, this will only work on systems providing the proc file
@@ -213,12 +219,12 @@ Chapter 1. Admin Guide
    Operations Centre), or administrator.
 
    The SNMPStats module expects to connect to a Master Agent. This would
-   be a NetSNMP daemon running either on the same system as the OpenSER
+   be a NetSNMP daemon running either on the same system as the Kamailio
    instance, or on another system. (Communication can take place over TCP,
    so there is no restriction that this daemon need be on the same system
-   as OpenSER).
+   as Kamailio).
 
-   If the master agent is unavailable when OpenSER first starts up, the
+   If the master agent is unavailable when Kamailio first starts up, the
    SNMPStats module will continue to run. However, you will not be able to
    query it. Thankfully, the SNMPStats module continually looks for its
    master agent. So even if the master agent is started late, or if the
@@ -250,10 +256,10 @@ Chapter 1. Admin Guide
        respective tables will be empty.
      * dialog - all scalars relating to the number of dialogs are
        dependent on the presence of the dialog module. Furthermore, if the
-       module is not loaded, then the openserDialogLimitMinorEvent, and
-       openserDialogLimitMajorEvent alarm will be disabled.
+       module is not loaded, then the kamailioDialogLimitMinorEvent, and
+       kamailioDialogLimitMajorEvent alarm will be disabled.
 
-   The contents of the openserSIPMethodSupportedTable change depending on
+   The contents of the kamailioSIPMethodSupportedTable change depending on
    which modules are loaded.
 
 3.2. External Libraries or Applications
@@ -282,9 +288,9 @@ Chapter 1. Admin Guide
 
 4.1. sipEntityType (String)
 
-   This parameter describes the entity type for this OpenSER instance, and
-   will be used in determining what is returned for the
-   openserSIPEntityType scalar. Valid parameters are:
+   This parameter describes the entity type for this Kamailio instance,
+   and will be used in determining what is returned for the
+   kamailioSIPEntityType scalar. Valid parameters are:
 
    registrarServer, redirectServer, proxyServer, userAgent, other
 
@@ -295,15 +301,15 @@ modparam("snmpstats", "sipEntityType", "proxyServer")
 ...
 
    Note that as the above example shows, you can define this parameter
-   more than once. This is of course because a given OpenSER instance can
+   more than once. This is of course because a given Kamailio instance can
    take on more than one role.
 
 4.2. MsgQueueMinorThreshold (Integer)
 
    The SNMPStats module monitors the number of bytes waiting to be
-   consumed by OpenSER. If the number of bytes waiting to be consumed
+   consumed by Kamailio. If the number of bytes waiting to be consumed
    exceeds a minor threshold, the SNMPStats module will send out an
-   openserMsgQueueDepthMinorEvent trap to signal that an alarm condition
+   kamailioMsgQueueDepthMinorEvent trap to signal that an alarm condition
    has occured. The minor threshold is set with the MsgQueueMinorThreshold
    parameter.
 
@@ -318,9 +324,9 @@ modparam("snmpstats", "MsgQueueMinorThreshold", 2000)
 4.3. MsgQueueMajorThreshold (Integer)
 
    The SNMPStats module monitors the number of bytes waiting to be
-   consumed by OpenSER. If the number of bytes waiting to be consumed
+   consumed by Kamailio. If the number of bytes waiting to be consumed
    exceeds a major threshold, the SNMPStats module will send out an
-   openserMsgQueueDepthMajorEvent trap to signal that an alarm condition
+   kamailioMsgQueueDepthMajorEvent trap to signal that an alarm condition
    has occured. The major threshold is set with the MsgQueueMajorThreshold
    parameter.
 
@@ -336,7 +342,7 @@ modparam("snmpstats", "MsgQueueMajorThreshold", 5000)
 
    The SNMPStats module monitors the number of active dialogs. If the
    number of active dialogs exceeds a minor threshold, the SNMPStats
-   module will send out an openserDialogLimitMinorEvent trap to signal
+   module will send out an kamailioDialogLimitMinorEvent trap to signal
    that an alarm condition has occured. The minor threshold is set with
    the dlg_minor_threshold parameter.
 
@@ -352,7 +358,7 @@ modparam("snmpstats", "MsgQueueMajorThreshold", 5000)
 
    The SNMPStats module monitors the number of active dialogs. If the
    number of active dialogs exceeds a major threshold, the SNMPStats
-   module will send out an openserDialogLimitMajorEvent trap to signal
+   module will send out an kamailioDialogLimitMajorEvent trap to signal
    that an alarm condition has occured. The major threshold is set with
    the dlg_major_threshold parameter.
 
@@ -366,7 +372,7 @@ modparam("snmpstats", "MsgQueueMajorThreshold", 5000)
 
 4.6. snmpgetPath (String)
 
-   The SNMPStats module provides the openserSIPServiceStartTime scalar.
+   The SNMPStats module provides the kamailioSIPServiceStartTime scalar.
    This scalar requires the SNMPStats module to perform a snmpget query to
    the master agent. You can use this parameter to set the path to your
    instance of NetSNMP's snmpget program.
@@ -380,7 +386,7 @@ modparam("snmpstats", "snmpgetPath",     "/my/custom/path/")
 
 4.7. snmpCommunity (String)
 
-   The SNMPStats module provides the openserSIPServiceStartTime scalar.
+   The SNMPStats module provides the kamailioSIPServiceStartTime scalar.
    This scalar requires the SNMPStats module to perform a snmpget query to
    the master agent. If you have defined a custom community string for the
    snmp daemon, you need to specify it with this parameter.
@@ -423,7 +429,7 @@ modparam("snmpstats", "export_registrar", 1)
    There are several things that need to be done to get the SNMPStats
    module compiled and up and running.
 
-6.1. Compiling the SNMPStats Module
+6.1.  Compiling the SNMPStats Module
 
    In order for the SNMPStats module to compile, you will need at least
    version 5.3 of the NetSNMP source code. The source can be found at:
@@ -434,8 +440,8 @@ modparam("snmpstats", "export_registrar", 1)
 
    The SNMPStats modules makefile requires that the NetSNMP script
    "net-snmp-config" can run. At a minimum, running "net-snmp-config
-   --agent-libs" from the OpenSER source directory should return something
-   similar to:
+   --agent-libs" from the Kamailio source directory should return
+   something similar to:
     -L/usr/local/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp
 
    The specifics of what is returned depends on how the system was
@@ -445,7 +451,7 @@ modparam("snmpstats", "export_registrar", 1)
    recommended you install NetSNMP from source to avoid bringing in
    excessive dependencies to the SNMPStats module.
 
-6.2. Configuring NetSNMP to allow connections from the SNMPStats module.
+6.2.  Configuring NetSNMP to allow connections from the SNMPStats module.
 
    The SNMPStats module will communicate with the NetSNMP Master Agent.
    This communication happens over a protocol known as AgentX. This means
@@ -477,7 +483,7 @@ modparam("snmpstats", "export_registrar", 1)
    This tells NetSNMP to act as a master agent, listening on the localhost
    UDP interface at port 705.
 
-6.3. Configuring the SNMPStats module for communication with a Master Agent
+6.3.  Configuring the SNMPStats module for communication with a Master Agent
 
    The previous section explained how to set up a NetSNMP master agent to
    accept AgentX connections. We now need to tell the SNMPStats module how
@@ -494,10 +500,10 @@ modparam("snmpstats", "export_registrar", 1)
    The above line tells the SNMPStats module to register with the master
    agent on the localhost, port 705. The parameters should match up with
    the snmpd process. Note that the master agent (snmpd) does not need to
-   be present on the same machine as OpenSER. localhost could be replaced
+   be present on the same machine as Kamailio. localhost could be replaced
    with any other machine.
 
-6.4. Testing for a proper Configuration
+6.4.  Testing for a proper Configuration
 
    As a quick test to make sure that the SNMPStats module sub-agent can
    succesfully connect to the NetSNMP Master agent, start snmpd with the
@@ -513,7 +519,7 @@ modparam("snmpstats", "export_registrar", 1)
     agentx/master: initializing...   DONE
     NET-SNMP version 5.3.1
 
-   Now, start up OpenSER in another window. In the snmpd window, you
+   Now, start up Kamailio in another window. In the snmpd window, you
    should see a bunch of:
     agentx/master: handle pdu (req=0x2c58ebd4,trans=0x0,sess=0x0)
     agentx/master: open 0x81137c0
@@ -618,8 +624,8 @@ Chapter 2. Frequently Asked Questions
 
    On some systems, you may receive the following error at stdout or the
    log files depending on the configuration.
-    ERROR: load_module: could not open module </usr/local/lib/openser/modules/sn
-mpstats.so>:
+    ERROR: load_module: could not open module </usr/local/lib/kamailio/modules_k
+/snmpstats.so>:
            libnetsnmpmibs.so.10: cannot open shared object file: No such file or
  directory.
 
@@ -649,17 +655,17 @@ mpstats.so>:
    How can I learn what all the scalars and tables are?
 
    All scalars and tables are named in the SNMPStats module overview. The
-   files OPENSER-MIB, OPENSER-REG-MIB, OPENSER-SIP-COMMON-MIB and
-   OPENSER-SIP-SERVER-MIB contain the full definitions and descriptions.
+   files KAMAILIO-MIB, KAMAILIO-REG-MIB, KAMAILIO-SIP-COMMON-MIB and
+   KAMAILIO-SIP-SERVER-MIB contain the full definitions and descriptions.
    Note however, that the MIBs may actually contain scalars and tables
    which are currently not provided by the SNMPStats module. Therefore, it
    is better to use NetSNMP's snmptranslate as an alternative. Take the
-   openserSIPEntityType scalar as an example. You can invoke snmptranslate
-   as follows:
-    snmptranslate -TBd openserSIPEntityType
+   kamailioSIPEntityType scalar as an example. You can invoke
+   snmptranslate as follows:
+    snmptranslate -TBd kamailioSIPEntityType
 
    Which would result in something similar to the following:
-    -- FROM       OPENSER-SIP-COMMON-MIB
+    -- FROM       KAMAILIO-SIP-COMMON-MIB
     -- TEXTUAL CONVENTION KamailioSIPEntityRole
     SYNTAX        BITS {other(0), userAgent(1), proxyServer(2), redirectServer(3
 ), registrarServer(4)}
@@ -695,13 +701,13 @@ mpstats.so>:
     snmpget -v 2c -c theCommunityString machineToSendTheMachineTo scalarElement.
 0
 
-   For example, consider an snmpget on the openserSIPEntityType scalar,
+   For example, consider an snmpget on the kamailioSIPEntityType scalar,
    run on the same machine running the Kamailio instance, with the default
    "public" community string. The command would be:
-    snmpget -v2c -c public localhost openserSIPEntityType.0
+    snmpget -v2c -c public localhost kamailioSIPEntityType.0
 
    Which would result in something similar to:
-    OPENSER-SIP-COMMON-MIB::openserSIPEntityType.0 = BITS: F8 \
+    KAMAILIO-SIP-COMMON-MIB::kamailioSIPEntityType.0 = BITS: F8 \
                 other(0) userAgent(1) proxyServer(2)          \
                 redirectServer(3) registrarServer(4)
 
@@ -713,14 +719,14 @@ mpstats.so>:
     snmptable -Ci -v 2c -c theCommunityString machineToSendTheMachineTo theTable
 Name
 
-   For example, consider the openserSIPRegUserTable. If we run the
+   For example, consider the kamailioSIPRegUserTable. If we run the
    snmptable command on the same machine as the running Kamailio instance,
    configured with the default "public" community string. The command
    would be:
-    snmptable -Ci -v 2c -c public localhost openserSIPRegUserTable
+    snmptable -Ci -v 2c -c public localhost kamailioSIPRegUserTable
 
    Which would result in something similar to:
-    index openserSIPUserUri openserSIPUserAuthenticationFailures
+    index kamailioSIPUserUri kamailioSIPUserAuthenticationFailures
         1       DefaultUser                                    0
         2            bogdan                                    0
         3    jeffrey.magder                                    0

modules_k/snmpstats/alarm_checks.c

@@ -90,8 +90,8 @@ int check_dialog_alarm(int threshold_to_compare_to)
 	return 0;
 }
 
-/*! This function will be called periodically from an OpenSER timer.  The first
- * time it is called, it will query OPENSER-MIB for configured thresholds.
+/*! This function will be called periodically from an Kamailio timer.  The first
+ * time it is called, it will query KAMAILIO-MIB for configured thresholds.
  */
 void run_alarm_check(unsigned int ticks, void * attr) 
 {
@@ -134,7 +134,7 @@ void run_alarm_check(unsigned int ticks, void * attr)
 
 	if (bytesInMsgQueue != 0) 
 	{
-		send_openserMsgQueueDepthMinorEvent_trap(bytesInMsgQueue, 
+		send_kamailioMsgQueueDepthMinorEvent_trap(bytesInMsgQueue, 
 						msg_queue_minor_threshold);
 	}
 
@@ -143,7 +143,7 @@ void run_alarm_check(unsigned int ticks, void * attr)
 
 	if (bytesInMsgQueue != 0) 
 	{
-		send_openserMsgQueueDepthMajorEvent_trap(bytesInMsgQueue, 
+		send_kamailioMsgQueueDepthMajorEvent_trap(bytesInMsgQueue, 
 						msg_queue_major_threshold);
 	}
 
@@ -153,7 +153,7 @@ void run_alarm_check(unsigned int ticks, void * attr)
 
 	if (numActiveDialogs != 0)
 	{
-		send_openserDialogLimitMinorEvent_trap(numActiveDialogs,
+		send_kamailioDialogLimitMinorEvent_trap(numActiveDialogs,
 						dialog_minor_threshold);
 	}
 	
@@ -161,7 +161,7 @@ void run_alarm_check(unsigned int ticks, void * attr)
 
 	if (numActiveDialogs != 0)
 	{
-		send_openserDialogLimitMajorEvent_trap(numActiveDialogs,
+		send_kamailioDialogLimitMajorEvent_trap(numActiveDialogs,
 						dialog_major_threshold);
 	}
 }

modules_k/snmpstats/alarm_checks.h

@@ -51,8 +51,8 @@ int check_msg_queue_alarm(int threshold_to_compare_to);
  * otherwise. */
 int check_dialog_alarm(int threshold_to_compare_to);
 
-/*! This function will be called periodically from an OpenSER timer.  The first
- * time it is called, it will query OPENSER-MIB for configured thresholds.
+/*! This function will be called periodically from an Kamailio timer.  The first
+ * time it is called, it will query KAMAILIO-MIB for configured thresholds.
  */
 void run_alarm_check(unsigned int ticks, void * attr);
 

modules_k/snmpstats/doc/snmpstats.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!-- Include general OpenSER documentation entities -->
+<!-- Include general Kamailio documentation entities -->
 <!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
 %docentities;
 

modules_k/snmpstats/doc/snmpstats_admin.xml

@@ -17,44 +17,48 @@
 		<title>Overview</title>
 
 		<para>The SNMPStats module provides an SNMP management interface
-		to OpenSER.  Specifically, it provides general SNMP queryable 
+		to Kamailio.  Specifically, it provides general SNMP queryable 
 		scalar statistics, table representations of more complicated data such as 
 		user and contact information, and alarm monitoring capabilities.
 		</para>
+		<para>
+		The MIB has been renamed in version 4.0.0 to reflect the product name. Please
+		note that all the OID names has changed, as well as the MIB itself.
+		</para>
 		<section>
 			<title>General Scalar Statistics</title>
 			<para>
 			The SNMPStats module provides a number of general scalar statistics.  
-			Details are available in OPENSER-MIB, OPENSER-REG-MIB, 
-			OPENSER-SIP-COMMON-MIB, and OPENSER-SIP-SERVER-MIB.  But briefly, 
+			Details are available in KAMAILIO-MIB, KAMAILIO-REG-MIB, 
+			KAMAILIO-SIP-COMMON-MIB, and KAMAILIO-SIP-SERVER-MIB.  But briefly, 
 			these scalars are:
 			</para>
 			<para>
-			openserSIPProtocolVersion, openserSIPServiceStartTime, openserSIPEntityType,
-			openserSIPSummaryInRequests, openserSIPSummaryOutRequest, 
-			openserSIPSummaryInResponses, openserSIPSummaryOutResponses,
-			openserSIPSummaryTotalTransactions, openserSIPCurrentTransactions, 
-			openserSIPNumUnsupportedUris, openserSIPNumUnsupportedMethods, 
-			openserSIPOtherwiseDiscardedMsgs, openserSIPProxyStatefulness
-			openserSIPProxyRecordRoute, openserSIPProxyAuthMethod, 
-			openserSIPNumProxyRequireFailures, openserSIPRegMaxContactExpiryDuration,
-			openserSIPRegMaxUsers, openserSIPRegCurrentUsers, 
-			openserSIPRegDfltRegActiveInterval, openserSIPRegAcceptedRegistrations,
-			openserSIPRegRejectedRegistrations, openserMsgQueueDepth.
-			openserCurNumDialogs, openserCurNumDialogsInProgress, 
-			openserCurNumDialogsInSetup, openserTotalNumFailedDialogSetups
+			kamailioSIPProtocolVersion, kamailioSIPServiceStartTime, kamailioSIPEntityType,
+			kamailioSIPSummaryInRequests, kamailioSIPSummaryOutRequest, 
+			kamailioSIPSummaryInResponses, kamailioSIPSummaryOutResponses,
+			kamailioSIPSummaryTotalTransactions, kamailioSIPCurrentTransactions, 
+			kamailioSIPNumUnsupportedUris, kamailioSIPNumUnsupportedMethods, 
+			kamailioSIPOtherwiseDiscardedMsgs, kamailioSIPProxyStatefulness
+			kamailioSIPProxyRecordRoute, kamailioSIPProxyAuthMethod, 
+			kamailioSIPNumProxyRequireFailures, kamailioSIPRegMaxContactExpiryDuration,
+			kamailioSIPRegMaxUsers, kamailioSIPRegCurrentUsers, 
+			kamailioSIPRegDfltRegActiveInterval, kamailioSIPRegAcceptedRegistrations,
+			kamailioSIPRegRejectedRegistrations, kamailioMsgQueueDepth.
+			kamailioCurNumDialogs, kamailioCurNumDialogsInProgress, 
+			kamailioCurNumDialogsInSetup, kamailioTotalNumFailedDialogSetups
 			</para>
 			<para>
 			There are also scalars associated with alarms.  They are as follows:
 			</para>
 
 			<para>
-			openserMsgQueueMinorThreshold, openserMsgQueueMajorThreshold,
-			openserMsgQueueDepthAlarmStatus, openserMsgQueueDepthMinorAlarm,
-			openserMsgQueueDepthMajorAlarm, openserDialogLimitMinorThreshold,
-			openserDialogLimitMajorThreshold, openserDialogUsageState,
-			openserDialogLimitAlarmStatus, openserDialogLimitMinorAlarm,
-			openserDialogLimitMajorAlarm
+			kamailioMsgQueueMinorThreshold, kamailioMsgQueueMajorThreshold,
+			kamailioMsgQueueDepthAlarmStatus, kamailioMsgQueueDepthMinorAlarm,
+			kamailioMsgQueueDepthMajorAlarm, kamailioDialogLimitMinorThreshold,
+			kamailioDialogLimitMajorThreshold, kamailioDialogUsageState,
+			kamailioDialogLimitAlarmStatus, kamailioDialogLimitMinorAlarm,
+			kamailioDialogLimitMajorAlarm
 			</para>
 		</section>
 		<section>
@@ -65,9 +69,9 @@
 			</para>
 
 			<para>
-			openserSIPPortTable, openserSIPMethodSupportedTable, 
-			openserSIPStatusCodesTable, openserSIPRegUserTable, openserSIPContactTable,
-			openserSIPRegUserLookupTable
+			kamailioSIPPortTable, kamailioSIPMethodSupportedTable, 
+			kamailioSIPStatusCodesTable, kamailioSIPRegUserTable, kamailioSIPContactTable,
+			kamailioSIPRegUserLookupTable
 			</para>
 		</section>
 		<section>
@@ -87,15 +91,15 @@
 				</para>
 				<para>
 				If a minor or major condition has occured, then a 
-				openserDialogLimitMinorEvent trap or a 
-				openserDialogLimitMajorEvent trap will be generated, 
+				kamailioDialogLimitMinorEvent trap or a 
+				kamailioDialogLimitMajorEvent trap will be generated, 
 				respectively. The minor and major thresholds are
 				described in the parameters section below.
 				</para>
 			</listitem>
 			<listitem>
 				<para>
-				The number of bytes waiting to be consumed across all of OpenSERs
+				The number of bytes waiting to be consumed across all of Kamailios
 				listening ports has passed a minor or major threshold.  The idea is
 				that a network operation centre can be made aware that a machine 
 				hosting a SIP server may be entering a degraded state, and to 
@@ -103,14 +107,14 @@
 				</para>
 				<para>
 				If the number of bytes to be consumed passes a minor or major 
-				threshold, then a openserMsgQueueDepthMinorEvent or 
-				openserMsgQueueDepthMajorEvent trap will be sent out, respectively.
+				threshold, then a kamailioMsgQueueDepthMinorEvent or 
+				kamailioMsgQueueDepthMajorEvent trap will be sent out, respectively.
 				</para>
 			</listitem>
 
 			</orderedlist>
 			<para>
-			Full details of these traps can be found in the distributions OPENSER-MIB
+			Full details of these traps can be found in the distributions KAMAILIO-MIB
 			file.  
 			</para>
 		</section>
@@ -123,21 +127,21 @@
 	<section>
 	<title>How the SNMPStats module gets its data</title>
 	<para>
-	The SNMPStats module uses OpenSERs internal statistic framework to collect most of its
+	The SNMPStats module uses Kamailios internal statistic framework to collect most of its
 	data. However, there are two exceptions.  
 	<orderedlist>
 		<listitem>
 			<para>
-			The openserSIPRegUserTable and openserSIPContactTable rely on the usrloc 
+			The kamailioSIPRegUserTable and kamailioSIPContactTable rely on the usrloc 
 			modules	callback system.  Specifically, the SNMPStats module will receive 
 			callbacks whenever a user/contact is added to the system.
 			</para>
 		</listitem>
 		<listitem>
 			<para>
-			The SNMPStats modules openserSIPMsgQueueDepthMinorEvent and 
-			openserSIPMsgQueueDepthMajorEvent alarms rely on the OpenSER core to find out
-			what interfaces, ports, and transports OpenSER is listening on.  However,
+			The SNMPStats modules kamailioSIPMsgQueueDepthMinorEvent and 
+			kamailioSIPMsgQueueDepthMajorEvent alarms rely on the Kamailio core to find out
+			what interfaces, ports, and transports Kamailio is listening on.  However,
 			the module will actually query the proc file system to find out the number
 			of bytes waiting to be consumed.  (Currently, this will only work on systems
 			providing the proc file system).
@@ -155,12 +159,12 @@
 	</para>
 	<para>
 	The SNMPStats module expects to connect to a <emphasis>Master Agent</emphasis>.  This
-	would be a NetSNMP daemon running either on the same system as the OpenSER instance, or 
+	would be a NetSNMP daemon running either on the same system as the Kamailio instance, or 
 	on another system.  (Communication can take place over TCP, so there is no restriction
-	that this daemon need be on the same system as OpenSER).
+	that this daemon need be on the same system as Kamailio).
 	</para>
 	<para>
-	If the master agent is unavailable when OpenSER first starts up, the SNMPStats module will
+	If the master agent is unavailable when Kamailio first starts up, the SNMPStats module will
 	continue to run.  However, you will not be able to query it.  Thankfully, the SNMPStats
 	module continually looks for its master agent.  So even if the master agent is started late, 
 	or if the link to the SNMPStats module is severed due to a temporary hardware failure
@@ -201,13 +205,13 @@
 		<para>
 		<emphasis>dialog</emphasis> - all scalars relating to the number of dialogs are 
 		dependent on the presence of the dialog module.  Furthermore, if the module is 
-		not loaded, then the openserDialogLimitMinorEvent, and openserDialogLimitMajorEvent
+		not loaded, then the kamailioDialogLimitMinorEvent, and kamailioDialogLimitMajorEvent
 		alarm will be disabled. 
 		</para>
 		</listitem>
 		
 		</itemizedlist>
-		The contents of the openserSIPMethodSupportedTable change depending on which modules
+		The contents of the kamailioSIPMethodSupportedTable change depending on which modules
 		are loaded.  
 		</para>
 	</section>
@@ -243,9 +247,9 @@
 		<title><varname>sipEntityType</varname> (String) </title>
 
 		<para>
-		This parameter describes the entity type for this OpenSER instance,
+		This parameter describes the entity type for this Kamailio instance,
 		and will be used in determining what is returned for the
-		openserSIPEntityType scalar. Valid parameters are:
+		kamailioSIPEntityType scalar. Valid parameters are:
 		</para>
 
 		<para>
@@ -266,7 +270,7 @@ modparam("snmpstats", "sipEntityType", "proxyServer")
 
 		<para>
 		Note that as the above example shows, you can define this parameter more
-		than once.  This is of course because a given OpenSER instance can take on
+		than once.  This is of course because a given Kamailio instance can take on
 		more than one role.
 		</para>
 	</section>
@@ -276,8 +280,8 @@ modparam("snmpstats", "sipEntityType", "proxyServer")
 
 		<para>
 		The SNMPStats module monitors the number of bytes waiting to be consumed by 
-		OpenSER.  If the number of bytes waiting to be consumed exceeds a minor
-		threshold, the SNMPStats module will send out an openserMsgQueueDepthMinorEvent
+		Kamailio.  If the number of bytes waiting to be consumed exceeds a minor
+		threshold, the SNMPStats module will send out an kamailioMsgQueueDepthMinorEvent
 		trap to signal that an alarm condition has occured.  The minor threshold is set
 		with the MsgQueueMinorThreshold parameter.  
 		</para>
@@ -301,8 +305,8 @@ modparam("snmpstats", "MsgQueueMinorThreshold", 2000)
 
 		<para>
 		The SNMPStats module monitors the number of bytes waiting to be consumed by 
-		OpenSER.  If the number of bytes waiting to be consumed exceeds a major
-		threshold, the SNMPStats module will send out an openserMsgQueueDepthMajorEvent
+		Kamailio.  If the number of bytes waiting to be consumed exceeds a major
+		threshold, the SNMPStats module will send out an kamailioMsgQueueDepthMajorEvent
 		trap to signal that an alarm condition has occured.  The major threshold is set
 		with the MsgQueueMajorThreshold parameter.  
 		</para>
@@ -327,7 +331,7 @@ modparam("snmpstats", "MsgQueueMajorThreshold", 5000)
 		<para>
 		The SNMPStats module monitors the number of active dialogs.  If the number of
 		active dialogs exceeds a minor threshold, the SNMPStats module will send out 
-		an openserDialogLimitMinorEvent trap to signal that an alarm condition has 
+		an kamailioDialogLimitMinorEvent trap to signal that an alarm condition has 
 		occured.  The minor threshold is set with the dlg_minor_threshold parameter.  
 		</para>
 
@@ -351,7 +355,7 @@ modparam("snmpstats", "MsgQueueMajorThreshold", 5000)
 		<para>
 		The SNMPStats module monitors the number of active dialogs.  If the number of
 		active dialogs exceeds a major threshold, the SNMPStats module will send out 
-		an openserDialogLimitMajorEvent trap to signal that an alarm condition has 
+		an kamailioDialogLimitMajorEvent trap to signal that an alarm condition has 
 		occured.  The major threshold is set with the dlg_major_threshold parameter.  
 		</para>
 
@@ -373,7 +377,7 @@ modparam("snmpstats", "MsgQueueMajorThreshold", 5000)
 		<title><varname>snmpgetPath</varname> (String)</title>
 
 		<para>
-		The SNMPStats module provides the openserSIPServiceStartTime scalar.
+		The SNMPStats module provides the kamailioSIPServiceStartTime scalar.
 		This scalar requires the SNMPStats module to perform a snmpget query
 		to the master agent.  You can use this parameter to set the path to 
 		your instance of NetSNMP's snmpget program.  
@@ -399,7 +403,7 @@ modparam("snmpstats", "snmpgetPath",     "/my/custom/path/")
 		<title><varname>snmpCommunity</varname> (String)</title>
 
 		<para>
-		The SNMPStats module provides the openserSIPServiceStartTime scalar.
+		The SNMPStats module provides the kamailioSIPServiceStartTime scalar.
 		This scalar requires the SNMPStats module to perform a snmpget query
 		to the master agent.  If you have defined a custom community string
 		for the snmp daemon, you need to specify it with this parameter.  
@@ -479,7 +483,7 @@ modparam("snmpstats", "export_registrar", 1)
 	<para>
 	The SNMPStats modules makefile requires that the NetSNMP script
 	"net-snmp-config" can run.  At a minimum, running "net-snmp-config --agent-libs"
-	from the OpenSER source directory should return something similar to: 
+	from the Kamailio source directory should return something similar to: 
 
 	<programlisting format="linespecific">
     -L/usr/local/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp
@@ -572,7 +576,7 @@ modparam("snmpstats", "export_registrar", 1)
 	The above line tells the SNMPStats module to register with the master agent on
 	the localhost, port 705.  The parameters should match up with the snmpd process.
 	Note that the master agent (snmpd) does not need to be present on the same
-	machine as OpenSER.  localhost could be replaced with any other machine. 
+	machine as Kamailio.  localhost could be replaced with any other machine. 
 	</para>
 	</section>
 	
@@ -600,7 +604,7 @@ modparam("snmpstats", "export_registrar", 1)
     NET-SNMP version 5.3.1
 	</programlisting>
 
-	Now, start up OpenSER in another window.  In the snmpd window, you should see a
+	Now, start up Kamailio in another window.  In the snmpd window, you should see a
 	bunch of:
 
 	<programlisting format="linespecific">

modules_k/snmpstats/doc/snmpstats_faq.xml

@@ -129,7 +129,7 @@
 		</para>
 
 		<programlisting format="linespecific">
-    ERROR: load_module: could not open module &lt;/usr/local/lib/openser/modules/snmpstats.so&gt;: 
+    ERROR: load_module: could not open module &lt;/usr/local/lib/kamailio/modules_k/snmpstats.so&gt;: 
            libnetsnmpmibs.so.10: cannot open shared object file: No such file or directory.
 		</programlisting>
 	
@@ -219,21 +219,21 @@
 	    <answer>
 		<para>
 		All scalars and tables are named in the SNMPStats module overview.  The files
-		OPENSER-MIB, OPENSER-REG-MIB, OPENSER-SIP-COMMON-MIB and OPENSER-SIP-SERVER-MIB
+		KAMAILIO-MIB, KAMAILIO-REG-MIB, KAMAILIO-SIP-COMMON-MIB and KAMAILIO-SIP-SERVER-MIB
 		contain the full definitions and descriptions.  Note however, that the MIBs
 		may actually contain scalars and tables which are currently not provided by the
 		SNMPStats module.  Therefore, it is better to use NetSNMP's snmptranslate
-		as an alternative. Take the openserSIPEntityType scalar as an example. You can
+		as an alternative. Take the kamailioSIPEntityType scalar as an example. You can
 		invoke snmptranslate as follows:
 
 		<programlisting format="linespecific">
-    snmptranslate -TBd openserSIPEntityType
+    snmptranslate -TBd kamailioSIPEntityType
 		</programlisting>		
 
 		Which would result in something similar to the following:
 
 		<programlisting format="linespecific">
-    -- FROM       OPENSER-SIP-COMMON-MIB
+    -- FROM       KAMAILIO-SIP-COMMON-MIB
     -- TEXTUAL CONVENTION KamailioSIPEntityRole
     SYNTAX        BITS {other(0), userAgent(1), proxyServer(2), redirectServer(3), registrarServer(4)} 
     MAX-ACCESS    read-only
@@ -279,18 +279,18 @@
     snmpget -v 2c -c theCommunityString machineToSendTheMachineTo scalarElement.0
     		</programlisting>
 
-		For example, consider an snmpget on the openserSIPEntityType scalar, 
+		For example, consider an snmpget on the kamailioSIPEntityType scalar, 
 		run on the same machine running the &kamailio; instance, with the default
 		"public" community string.  The command would be:
 
 		<programlisting format="linespecific">
-    snmpget -v2c -c public localhost openserSIPEntityType.0
+    snmpget -v2c -c public localhost kamailioSIPEntityType.0
 		</programlisting>
 
 		Which would result in something similar to:
 
 		<programlisting format="linespecific">
-    OPENSER-SIP-COMMON-MIB::openserSIPEntityType.0 = BITS: F8 \
+    KAMAILIO-SIP-COMMON-MIB::kamailioSIPEntityType.0 = BITS: F8 \
 		other(0) userAgent(1) proxyServer(2)          \
 		redirectServer(3) registrarServer(4) 
 		</programlisting>
@@ -310,18 +310,18 @@
     snmptable -Ci -v 2c -c theCommunityString machineToSendTheMachineTo theTableName
     		</programlisting>
 
-		For example, consider the openserSIPRegUserTable.  If we run the snmptable
+		For example, consider the kamailioSIPRegUserTable.  If we run the snmptable
 		command on the same machine as the running &kamailio; instance, configured with
 		the default "public" community string.  The command would be:
 
 		<programlisting format="linespecific">
-    snmptable -Ci -v 2c -c public localhost openserSIPRegUserTable
+    snmptable -Ci -v 2c -c public localhost kamailioSIPRegUserTable
 		</programlisting>
 
 		Which would result in something similar to:
 
 		<programlisting format="linespecific">
-    index openserSIPUserUri openserSIPUserAuthenticationFailures
+    index kamailioSIPUserUri kamailioSIPUserAuthenticationFailures
         1       DefaultUser                                    0
         2            bogdan                                    0
         3    jeffrey.magder                                    0

modules_k/snmpstats/hashTable.c

@@ -74,7 +74,7 @@ int calculateHashSlot(char *theString, int hashTableSize)
  * indexed with 'aor'.  If a match is found, then an aorToIndextStruct_t
  * structure is returned. 
  *
- * This function is called to discover the map between OpenSER's "aor" 
+ * This function is called to discover the map between Kamailio's "aor" 
  * (Address of Records) indexing scheme, and the SNMPStats modules integer
  * indexing scheme for its contact/user data. 
  *
@@ -105,7 +105,7 @@ aorToIndexStruct_t *findHashRecord(hashSlot_t *theTable, char *aor, int size)
 
 
 /*! Returns a chunk of memory large enough to store 'size' hashSlot's.  The
- * table will contain mappings between OpenSER's "aor" user/contact indexing
+ * table will contain mappings between Kamailio's "aor" user/contact indexing
  * scheme, and SNMPStats integer indexing scheme */
 hashSlot_t  *createHashTable(int size) 
 {
@@ -240,7 +240,7 @@ void deleteUser(hashSlot_t *theTable, char *aor, int hashTableSize)
 
 
 /*! Returns a aorToIndexStruct_t, holding the given 'userIndex' and 'aor'.  The
- * structure is used to map between the "aor" (OpenSER's way of indexing
+ * structure is used to map between the "aor" (Kamailio's way of indexing
  * users/contacts), and the SNMPStats user and contact integer indexes.  
  *
  * NOTE: that this record does not make a copy of aor, but instead points

modules_k/snmpstats/hashTable.h

@@ -32,7 +32,7 @@
  * \brief SNMP statistic module, hash table
  *
  * This file describes several structure.  In general, it was necessary to map
- * between OpenSER's "aor" (Address of Record) and string indexing mechanisms,
+ * between Kamailio's "aor" (Address of Record) and string indexing mechanisms,
  * and the SNMPStats modules integer indexing scheme for users and contacts.
  * While it would have been a more natural fit to use string indexes in the
  * SNMPStats module, SNMP limitations precluded this.  
@@ -58,7 +58,7 @@
 #define HASHSLOT_H
 
 /*!
- * Used to map between a 'contact' name (OpenSER's index) and a contact index.
+ * Used to map between a 'contact' name (Kamailio's index) and a contact index.
  * (SNMPStats Index) 
  */
 typedef struct contactToIndexStruct 
@@ -73,7 +73,7 @@ typedef struct contactToIndexStruct
 
 
 /*!
- * Used to map between an 'aor' (OpenSER index) and a user index. (SNMPStats
+ * Used to map between an 'aor' (Kamailio index) and a user index. (SNMPStats
  * index).  Since each user can have multiple contacts, the structure also has a
  * 'contactIndex', and a reference to the contactToIndexStruct list. 
  */
@@ -132,7 +132,7 @@ typedef struct hashSlot
 
 
 /*! Returns a aorToIndexStruct_t, holding the given 'userIndex' and 'aor'.  The
- * structure is used to map between the "aor" (OpenSER's way of indexing
+ * structure is used to map between the "aor" (Kamailio's way of indexing
  * users/contacts), and the SNMPStats user and contact integer indexes.  
  *
  * \note This record does not make a copy of aor, but instead points
@@ -143,7 +143,7 @@ aorToIndexStruct_t *createHashRecord(int userIndex, char *aor);
 
 
 /*! Returns a chunk of memory large enough to store 'size' hashSlot's.  The
- * table will contain mappings between OpenSER's "aor" user/contact indexing
+ * table will contain mappings between Kamailio's "aor" user/contact indexing
  * scheme, and SNMPStats integer indexing scheme */
 hashSlot_t  *createHashTable(int size);
 
@@ -158,7 +158,7 @@ int calculateHashSlot(char *theString, int hashTableSize);
  * indexed with 'aor'.  If a match is found, then an aorToIndextStruct_t
  * structure is returned. 
  *
- * This function is called to discover the map between OpenSER's "aor" 
+ * This function is called to discover the map between Kamailio's "aor" 
  * (Address of Records) indexing scheme, and the SNMPStats modules integer
  * indexing scheme for its contact/user data. 
  *

modules_k/snmpstats/interprocess_buffer.c

@@ -32,8 +32,8 @@
  * \brief SNMP statistic module, interprocess buffer
  *
  * This file implements the interprocess buffer, used for marshalling data
- * exchange from the usrloc module to the openserSIPRegUserTable,
- * openserSIPContactTable, and indirectly the openserSIPRegUserLookupTable.
+ * exchange from the usrloc module to the kamailioSIPRegUserTable,
+ * kamailioSIPContactTable, and indirectly the kamailioSIPRegUserLookupTable.
  *
  * Details on why the interprocess buffer is needed can be found in the comments
  * at the top of interprocess_buffer.h
@@ -194,7 +194,7 @@ void handleContactCallbacks(ucontact_t *contactInfo, int type, void *param)
 	return;
 
 error:
-	LM_ERR("Not enough shared memory for  openserSIPRegUserTable insert."
+	LM_ERR("Not enough shared memory for  kamailioSIPRegUserTable insert."
 			" (%s)\n", contactInfo->c.s);
 }
 
@@ -313,7 +313,7 @@ static void executeInterprocessBufferCmd(interprocessBuffer_t *currentBuffer)
 			currentUser->contactIndex, 
 				currentBuffer->stringContact)) {
 
-			LM_ERR("openserSIPRegUserTable was unable to allocate memory for "
+			LM_ERR("kamailioSIPRegUserTable was unable to allocate memory for "
 					"adding contact: %s to user %s.\n",
 					currentBuffer->stringName, currentBuffer->stringContact);
 

modules_k/snmpstats/interprocess_buffer.h

@@ -31,8 +31,8 @@
  * \file
  * \brief SNMP statistic module, interprocess buffer
  *
- * The SNMPStats module exposes user information through openserSIPRegUserTable,
- * openserSIPContactTable, and openserSIPRegUserLookupTable.  These tables are
+ * The SNMPStats module exposes user information through kamailioSIPRegUserTable,
+ * kamailioSIPContactTable, and kamailioSIPRegUserLookupTable.  These tables are
  * populated through callback mechanisms from the usrloc module.  Unfortunately
  * the NetSNMP table population code is very slow when dealing with large
  * amounts of data.  Because we don't want to experience a performance hit when

modules_k/snmpstats/mibs/OPENSER-MIB → modules_k/snmpstats/mibs/KAMAILIO-MIB

@@ -1,9 +1,9 @@
 -- ***********************************************************************
--- OPENSER-MIB:  OPENSER MIB
+-- KAMAILIO-MIB:  KAMAILIO MIB
 --
 -- Date of Creation: Januay 2006
 --
--- This MIB provides information related to the OpenSER SIP Router.
+-- This MIB provides information related to the Kamailio SIP Router.
 -- 
 -- Copyright (c) The Internet Society (2006)
 -- Ammendments (c) Soma Networks, Inc. (2006)
@@ -11,7 +11,7 @@
 -- All rights reserved.
 -- *****************************************************************
 
-OPENSER-MIB DEFINITIONS ::= BEGIN
+KAMAILIO-MIB DEFINITIONS ::= BEGIN
 
     IMPORTS
         MODULE-IDENTITY,
@@ -34,142 +34,145 @@ OPENSER-MIB DEFINITIONS ::= BEGIN
         X731UsageState,
         X731AlarmStatus,
         X731AlarmState
-            FROM OPENSER-TC
+            FROM KAMAILIO-TC
             
         MODULE-COMPLIANCE,
         OBJECT-GROUP,
         NOTIFICATION-GROUP
             FROM SNMPv2-CONF
 
-        openserModules, openserMIB
-            FROM OPENSER-REG-MIB;
+        kamailioModules, kamailioMIB
+            FROM KAMAILIO-REG-MIB;
 
-    openserModule MODULE-IDENTITY
-        LAST-UPDATED "200603231200Z"
-        ORGANIZATION "OpenSER"
+    kamailioModule MODULE-IDENTITY
+        LAST-UPDATED "201301081200Z"
+        ORGANIZATION "Kamailio"
         CONTACT-INFO 
-            "http://www.openser.org"
+            "http://www.kamailio.org"
         DESCRIPTION
-            "OpenSER MIB module.
+            "Kamailio MIB module.
              This module defines objects which are neceesary to monitor an
-             instance of OpenSER.
+             instance of Kamailio.
              
              The objects in this MIB are intended to be used in conjunction
-             with those rovided in OPENSER-SIP-COMMON-MIB and
-             OPENSER-SIP-SERVER-MIB.  In particular, this MIB defines the X.731
-             attributes required to monitor the OpenSER subsystems and the
-             OpenSER core itself."
+             with those rovided in KAMAILIO-SIP-COMMON-MIB and
+             KAMAILIO-SIP-SERVER-MIB.  In particular, this MIB defines the X.731
+             attributes required to monitor the Kamailio subsystems and the
+             Kamailio core itself."
         REVISION   "200605021200Z"
         DESCRIPTION
             "clarified some of the statisitcs collected, added the alarm 
             states and notifications."
         REVISION   "200603231200Z"
         DESCRIPTION
-           "changed ownership to OpenSER group, and made it SMIv2 compliant."
+           "changed ownership to Kamailio group, and made it SMIv2 compliant."
         REVISION   "200601061200Z"
         DESCRIPTION
-           "Initial version of the OPENSER-MIB module."
-        ::= { openserModules 5 }
+           "Initial version of the KAMAILIO-MIB module."
+        REVISION   "201301081200Z"
+        DESCRIPTION
+           "Renamed MIB and mib entries to new product name, Kamailio."
+        ::= { kamailioModules 5 }
 
 --
 -- Top-Level Components of this MIB.
 --
-    openserObjects OBJECT-IDENTITY
+    kamailioObjects OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for accessible objects in the MIB."
-        ::= { openserMIB 1 } 
+        ::= { kamailioMIB 1 } 
 
-    openserMIBEvents OBJECT-IDENTITY
+    kamailioMIBEvents OBJECT-IDENTITY
         STATUS current
         DESCRIPTION
-        "A sub-tree for all the OPENSER-MIB related events and traps."
-        ::= {openserMIB 2 }
+        "A sub-tree for all the KAMAILIO-MIB related events and traps."
+        ::= {kamailioMIB 2 }
 
-    openserConform OBJECT-IDENTITY
+    kamailioConform OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for Conformance specifications."
-        ::= { openserMIB 3 }
+        ::= { kamailioMIB 3 }
                                 
 
 --
--- openserObjects sub-components
+-- kamailioObjects sub-components
 --
-    openserServer  OBJECT-IDENTITY
+    kamailioServer  OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for Server state, alarms, and management."
-        ::= { openserObjects 1 }
+        ::= { kamailioObjects 1 }
 
-    openserMsgs  OBJECT-IDENTITY
+    kamailioMsgs  OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
-        "Sub-tree for tracking of individual SIP messages processed by OpenSER."
-        ::= { openserObjects 2 }
+        "Sub-tree for tracking of individual SIP messages processed by Kamailio."
+        ::= { kamailioObjects 2 }
 
-   openserDialog  OBJECT-IDENTITY
+   kamailioDialog  OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
-        "Sub-tree for tracking of SIP Dialogs being processed by OpenSER."
-    ::= { openserObjects 3 }
+        "Sub-tree for tracking of SIP Dialogs being processed by Kamailio."
+    ::= { kamailioObjects 3 }
 
 -- 
--- OpenSER Server Objects
+-- Kamailio Server Objects
 --
 
 
 --
--- OpenSER Message Objects
+-- Kamailio Message Objects
 --
 
 --
 -- Message Statistics 
 --
-    openserMsgStats OBJECT-IDENTITY
+    kamailioMsgStats OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for Message Statistics." 
-        ::= { openserMsgs 3 }
+        ::= { kamailioMsgs 3 }
 
-    openserMsgQueueDepth       OBJECT-TYPE
+    kamailioMsgQueueDepth       OBJECT-TYPE
         SYNTAX      Gauge32
         MAX-ACCESS  read-only
         STATUS      current
         DESCRIPTION
             "The number of packets (udp or tcp) waiting in the OS network queue, 
              waiting to be processed."
-        ::= { openserMsgStats 1 }
+        ::= { kamailioMsgStats 1 }
 
-    openserMsgQueueMinorThreshold    OBJECT-TYPE
+    kamailioMsgQueueMinorThreshold    OBJECT-TYPE
         SYNTAX      Integer32
         MAX-ACCESS  read-only
         STATUS      current
         DESCRIPTION
-            "When the openserMsgQueueDepth reaches this point, a minor alarm 
+            "When the kamailioMsgQueueDepth reaches this point, a minor alarm 
              will be generated. This value reflects the configured value; if it
              is set to -1, then the alarm is never sent."
-        ::= { openserMsgStats 2 }
+        ::= { kamailioMsgStats 2 }
         
-    openserMsgQueueMajorThreshold    OBJECT-TYPE
+    kamailioMsgQueueMajorThreshold    OBJECT-TYPE
         SYNTAX      Integer32
         MAX-ACCESS  read-only
         STATUS      current
         DESCRIPTION
-            "When the openserMsgQueueDepth reaches this point, a major alarm 
+            "When the kamailioMsgQueueDepth reaches this point, a major alarm 
              will be generated. This value reflects the configured value; if it
              is set to -1, then the alarm is never sent."
-        ::= { openserMsgStats 3 }
+        ::= { kamailioMsgStats 3 }
 --
 -- Message Alarms
 --
-    openserMsgAlarms OBJECT-IDENTITY
+    kamailioMsgAlarms OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for Message Alarms."
-        ::= { openserMsgs 4 }
+        ::= { kamailioMsgs 4 }
 
-    openserMsgQueueDepthAlarmStatus   OBJECT-TYPE
+    kamailioMsgQueueDepthAlarmStatus   OBJECT-TYPE
         SYNTAX      X731AlarmStatus
         MAX-ACCESS  read-only
         STATUS      current
@@ -177,7 +180,7 @@ OPENSER-MIB DEFINITIONS ::= BEGIN
             "This status variable reports the alarm levels that have been
              generated for the message queue depth.
                
-             The thresholds are defined in the OpenSER configuration; if they 
+             The thresholds are defined in the Kamailio configuration; if they 
              are not configured, this alarm status will always be clear. 
              Specifically, in this case no bits will be toggled, and therefore
              this scalar will return 00.
@@ -187,9 +190,9 @@ OPENSER-MIB DEFINITIONS ::= BEGIN
              
              underRepair(0), critical(1), major(2), minor(3), 
              alarmOutstanding(4), unknown(5)"
-        ::= { openserMsgAlarms 1 }
+        ::= { kamailioMsgAlarms 1 }
 
-    openserMsgQueueDepthMinorAlarm  OBJECT-TYPE
+    kamailioMsgQueueDepthMinorAlarm  OBJECT-TYPE
         SYNTAX      X731AlarmState
         MAX-ACCESS  read-only
         STATUS      current
@@ -198,9 +201,9 @@ OPENSER-MIB DEFINITIONS ::= BEGIN
              threshold has been surpassed.
                 clear(0) the queue depth is below the configured threshold.
                 minor(1) the queue depth has exceeded the configured threshold."
-        ::= { openserMsgAlarms 2 }
+        ::= { kamailioMsgAlarms 2 }
     
-    openserMsgQueueDepthMajorAlarm  OBJECT-TYPE
+    kamailioMsgQueueDepthMajorAlarm  OBJECT-TYPE
         SYNTAX      X731AlarmState
         MAX-ACCESS  read-only
         STATUS      current
@@ -209,9 +212,9 @@ OPENSER-MIB DEFINITIONS ::= BEGIN
              threshold has been surpassed.               
                 clear(0) the queue depth is below the configured threshold.
                 major(2) the queue depth has exceeded the configured threshold."
-        ::= { openserMsgAlarms 3 }
+        ::= { kamailioMsgAlarms 3 }
 --
--- OpenSER Dialog Objects
+-- Kamailio Dialog Objects
 --
 
 --
@@ -219,46 +222,46 @@ OPENSER-MIB DEFINITIONS ::= BEGIN
 --    contains information about currently active calls.
 --
 
-    openserDialogTable   OBJECT-TYPE
-          SYNTAX      SEQUENCE OF  OpenSERDialogTableEntry
+    kamailioDialogTable   OBJECT-TYPE
+          SYNTAX      SEQUENCE OF  KamailioDialogTableEntry
           MAX-ACCESS  not-accessible
           STATUS      current
           DESCRIPTION
               "This table contains information on all active calls in
                the system."
-          ::= { openserDialog 1 }
+          ::= { kamailioDialog 1 }
   
-    openserDialogTableEntry   OBJECT-TYPE
-          SYNTAX      OpenSERDialogTableEntry
+    kamailioDialogTableEntry   OBJECT-TYPE
+          SYNTAX      KamailioDialogTableEntry
           MAX-ACCESS  not-accessible
           STATUS      current
           DESCRIPTION
              "This entry contains information for a single active call in the
               system."
-          INDEX { openserDialogIndex }
-          ::= { openserDialogTable 1 }
+          INDEX { kamailioDialogIndex }
+          ::= { kamailioDialogTable 1 }
 
-    OpenSERDialogTableEntry ::= 
+    KamailioDialogTableEntry ::= 
         SEQUENCE {
-            openserDialogIndex              Unsigned32,
-            openserDialogType               INTEGER,
-            openserDialogToUri              SnmpAdminString,
-            openserDialogFromUri            SnmpAdminString,
-            openserDialogState              INTEGER,
-            openserDialogStartTime          DateAndTime,
-            openserDialogLastUpdateTime     DateAndTime,
-            openserDialogExpiryTime         DateAndTime
+            kamailioDialogIndex              Unsigned32,
+            kamailioDialogType               INTEGER,
+            kamailioDialogToUri              SnmpAdminString,
+            kamailioDialogFromUri            SnmpAdminString,
+            kamailioDialogState              INTEGER,
+            kamailioDialogStartTime          DateAndTime,
+            kamailioDialogLastUpdateTime     DateAndTime,
+            kamailioDialogExpiryTime         DateAndTime
         }
 
-    openserDialogIndex OBJECT-TYPE
+    kamailioDialogIndex OBJECT-TYPE
         SYNTAX      Unsigned32
         MAX-ACCESS  not-accessible
         STATUS current
         DESCRIPTION 
         "The index of this dialog."
-        ::= { openserDialogTableEntry 1 }
+        ::= { kamailioDialogTableEntry 1 }
 
-   openserDialogType OBJECT-TYPE
+   kamailioDialogType OBJECT-TYPE
         SYNTAX      INTEGER {
             invite(1),
             subscribe(2)
@@ -269,25 +272,25 @@ OPENSER-MIB DEFINITIONS ::= BEGIN
         "The type of Dialog:
             invite(1)     - the dialog was created with a SIP INVITE.
             subscribe(2)  - the dialog was created with a SIP SUBSCRIBE."
-        ::= { openserDialogTableEntry 2 }
+        ::= { kamailioDialogTableEntry 2 }
                 
-    openserDialogToUri OBJECT-TYPE
+    kamailioDialogToUri OBJECT-TYPE
         SYNTAX      SnmpAdminString
         MAX-ACCESS  read-only
         STATUS current
         DESCRIPTION 
         "The URI of the To header."
-        ::= { openserDialogTableEntry 3 }
+        ::= { kamailioDialogTableEntry 3 }
         
-    openserDialogFromUri OBJECT-TYPE
+    kamailioDialogFromUri OBJECT-TYPE
         SYNTAX      SnmpAdminString
         MAX-ACCESS  read-only
         STATUS current
         DESCRIPTION 
         "The URI of the From header."
-        ::= { openserDialogTableEntry 4 }
+        ::= { kamailioDialogTableEntry 4 }
         
-    openserDialogState OBJECT-TYPE
+    kamailioDialogState OBJECT-TYPE
         SYNTAX  INTEGER {
             unconfirmed(0),
             early(1),
@@ -310,140 +313,140 @@ OPENSER-MIB DEFINITIONS ::= BEGIN
                                received.
               
           terminated dialogs stay present in the system for only a short period 
-          of time, and then are cleared by OpenSER."
-        ::= { openserDialogTableEntry 5 }
+          of time, and then are cleared by Kamailio."
+        ::= { kamailioDialogTableEntry 5 }
         
-    openserDialogStartTime OBJECT-TYPE
+    kamailioDialogStartTime OBJECT-TYPE
         SYNTAX      DateAndTime
         MAX-ACCESS  read-only
         STATUS current
         DESCRIPTION 
         "The time this dialog was started."
-        ::= { openserDialogTableEntry 6 }
+        ::= { kamailioDialogTableEntry 6 }
         
-    openserDialogLastUpdateTime OBJECT-TYPE
+    kamailioDialogLastUpdateTime OBJECT-TYPE
         SYNTAX      DateAndTime
         MAX-ACCESS  read-only
         STATUS current
         DESCRIPTION 
         "The last time this dialog was updated; ie, when the last SIP
          message for this dialog was seen."
-        ::= { openserDialogTableEntry 7 }        
+        ::= { kamailioDialogTableEntry 7 }        
 
-    openserDialogExpiryTime OBJECT-TYPE
+    kamailioDialogExpiryTime OBJECT-TYPE
         SYNTAX      DateAndTime
         MAX-ACCESS  read-only
         STATUS current
         DESCRIPTION 
         "The time at which this dialog will automatically expire."
-        ::= { openserDialogTableEntry 8 }        
+        ::= { kamailioDialogTableEntry 8 }        
 
 
-    openserDialogStats OBJECT-IDENTITY
+    kamailioDialogStats OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-section for Dialog counters and statistics."
-        ::= { openserDialog 2 }
+        ::= { kamailioDialog 2 }
 
-    openserCurNumDialogs     OBJECT-TYPE
+    kamailioCurNumDialogs     OBJECT-TYPE
         SYNTAX      Gauge32
         MAX-ACCESS  read-only
         STATUS      current
         DESCRIPTION
             "The current number of dialogs either in EARLY or CONFIRMED 
              state."
-        ::= { openserDialogStats 1 }
+        ::= { kamailioDialogStats 1 }
         
-    openserCurNumDialogsInProgress     OBJECT-TYPE
+    kamailioCurNumDialogsInProgress     OBJECT-TYPE
         SYNTAX      Gauge32
         MAX-ACCESS  read-only
         STATUS      current
         DESCRIPTION
             "The current number of CONFIRMED dialogs."
-        ::= { openserDialogStats 2 }
+        ::= { kamailioDialogStats 2 }
         
-    openserCurNumDialogsInSetup     OBJECT-TYPE
+    kamailioCurNumDialogsInSetup     OBJECT-TYPE
         SYNTAX      Gauge32
         MAX-ACCESS  read-only
         STATUS      current
         DESCRIPTION
             "The current number of EARLY dialogs."
-        ::= { openserDialogStats 3 }
+        ::= { kamailioDialogStats 3 }
         
-    openserTotalNumFailedDialogSetups     OBJECT-TYPE
+    kamailioTotalNumFailedDialogSetups     OBJECT-TYPE
         SYNTAX      Counter32
         MAX-ACCESS  read-only
         STATUS      current
         DESCRIPTION
             "The total number of calls that failed with an error. 
              The following codes define a failed call:"
-        ::= { openserDialogStats 4 }
+        ::= { kamailioDialogStats 4 }
 
-    openserDialogLimitMinorThreshold    OBJECT-TYPE
+    kamailioDialogLimitMinorThreshold    OBJECT-TYPE
         SYNTAX      Integer32
         MAX-ACCESS  read-only
         STATUS      current
         DESCRIPTION
-            "The configured minor threshold indicating the openser system has 
+            "The configured minor threshold indicating the kamailio system has 
              reached a high level of dialogs. -1 indicates the value
              is not configured, and the alarm will never be set."
-        ::= { openserDialogStats 5 }
+        ::= { kamailioDialogStats 5 }
 
-    openserDialogLimitMajorThreshold    OBJECT-TYPE
+    kamailioDialogLimitMajorThreshold    OBJECT-TYPE
         SYNTAX      Integer32
         MAX-ACCESS  read-only
         STATUS      current
         DESCRIPTION
-            "The configured threshold indicating the openser system has reached
+            "The configured threshold indicating the kamailio system has reached
              a maximum number of dialogs, and perhaps performace will suffer.
              -1 indicates the value is not configured, and alarms will never be 
              set, and the usage state will never be reported as 'busy'."
-        ::= { openserDialogStats 6 }
+        ::= { kamailioDialogStats 6 }
 
-    openserTotalNumDialogSetups     OBJECT-TYPE
+    kamailioTotalNumDialogSetups     OBJECT-TYPE
         SYNTAX      Counter32
         MAX-ACCESS  read-only
         STATUS      current
         DESCRIPTION
             "The total number of calls (answered and failed)."
-        ::= { openserDialogStats 7 }
+        ::= { kamailioDialogStats 7 }
 
 
 --
 -- Dialog State
 --
 
-    openserDialogStates  OBJECT-IDENTITY
+    kamailioDialogStates  OBJECT-IDENTITY
         STATUS current
         DESCRIPTION
-        "a sub-tree for OpenSER's dialog tracking states."
-        ::= { openserDialog 3 }
+        "a sub-tree for Kamailio's dialog tracking states."
+        ::= { kamailioDialog 3 }
     
-    openserDialogUsageState     OBJECT-TYPE
+    kamailioDialogUsageState     OBJECT-TYPE
         SYNTAX      X731UsageState
         MAX-ACCESS  read-only
         STATUS      current
         DESCRIPTION
-        "The current usage state of OpenSER's dialog tracking:
+        "The current usage state of Kamailio's dialog tracking:
             idle(0)   - no dialogs are currently being tracked.
             active(1) - at least 1 dialog is being tracked.
             busy(2)   - the maximum number of dialogs are being tracked.
                         
          The 'busy' point is based on a configuration variable (the same as
-         openserDialogMajorLimitThreshold): if this value is -1, then the server
+         kamailioDialogMajorLimitThreshold): if this value is -1, then the server
          is never considered 'busy'."
-    ::= { openserDialogStates 1 }
+    ::= { kamailioDialogStates 1 }
 
 --
 -- Dialog Alarms
 --
-    openserDialogAlarms   OBJECT-IDENTITY
+    kamailioDialogAlarms   OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for call alarms." 
-    ::= { openserDialog 4 }
+    ::= { kamailioDialog 4 }
 
-    openserDialogLimitAlarmStatus  OBJECT-TYPE
+    kamailioDialogLimitAlarmStatus  OBJECT-TYPE
         SYNTAX      X731AlarmStatus
         MAX-ACCESS  read-only
         STATUS      current
@@ -457,96 +460,96 @@ OPENSER-MIB DEFINITIONS ::= BEGIN
              
             underRepair(0), critical(1), major(2), minor(3), 
             alarmOutstanding(4), unknown(5)"
-        ::= { openserDialogAlarms 1 }
+        ::= { kamailioDialogAlarms 1 }
 
-   openserDialogLimitMinorAlarm  OBJECT-TYPE
+   kamailioDialogLimitMinorAlarm  OBJECT-TYPE
         SYNTAX      X731AlarmState
         MAX-ACCESS  read-only
         STATUS      current
         DESCRIPTION
-           "The OpenSER system is approaching or has reached its configured 
+           "The Kamailio system is approaching or has reached its configured 
             minor dialog limit threshold.
                 clear(0) - the current number of dialogs is below the configured
                            threshold.
                 minor(1) - the current number of dialogs has reached or exceeded
                            the configured threshold.
                            
-            The threshold is defined in the OpenSER configuration; if it 
+            The threshold is defined in the Kamailio configuration; if it 
              is not configured, this alarm will not be sent."
-        ::= { openserDialogAlarms 2 }
+        ::= { kamailioDialogAlarms 2 }
 
-   openserDialogLimitMajorAlarm  OBJECT-TYPE
+   kamailioDialogLimitMajorAlarm  OBJECT-TYPE
         SYNTAX      X731AlarmState
         MAX-ACCESS  read-only
         STATUS      current
         DESCRIPTION
-           "The OpenSER system is approaching or has reached its configured 
+           "The Kamailio system is approaching or has reached its configured 
             dialog limit.
                 clear(0) - the current number of dialogs is below the configured
                            threshold.
                 major(2) - the current number of dialogs has reached or exceeded
                            the configured threshold.
             
-            The threshold is defined in the OpenSER configuration; if it 
+            The threshold is defined in the Kamailio configuration; if it 
              is not configured, this alarm will not be sent."
-        ::= { openserDialogAlarms 3 }
+        ::= { kamailioDialogAlarms 3 }
 
 -- 
 -- Notifications
 --
 
 --
--- This section defines the SNMP traps, or notifications, that the OPENSER-MIB
+-- This section defines the SNMP traps, or notifications, that the KAMAILIO-MIB
 -- supports.
 --
 
-    openserMIBNotifications  OBJECT-IDENTITY
+    kamailioMIBNotifications  OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "A sub-section for reverse-mapping between SNMPv1 and SNMPv2 events."
-        ::= { openserMIBEvents 0 } 
+        ::= { kamailioMIBEvents 0 } 
         
-    openserMsgQueueDepthMinorEvent NOTIFICATION-TYPE
+    kamailioMsgQueueDepthMinorEvent NOTIFICATION-TYPE
         OBJECTS {
-          openserMsgQueueDepth, openserMsgQueueMinorThreshold
+          kamailioMsgQueueDepth, kamailioMsgQueueMinorThreshold
         }
         STATUS  current
         DESCRIPTION
-        "The message queue depth (as reported by openserMsgQueueDepth) has 
-         exceeded the minor configured threshold openserMsgQueueMinorThreshold."
-        ::= { openserMIBNotifications 1 }
+        "The message queue depth (as reported by kamailioMsgQueueDepth) has 
+         exceeded the minor configured threshold kamailioMsgQueueMinorThreshold."
+        ::= { kamailioMIBNotifications 1 }
         
-    openserMsgQueueDepthMajorEvent NOTIFICATION-TYPE
+    kamailioMsgQueueDepthMajorEvent NOTIFICATION-TYPE
         OBJECTS {
-            openserMsgQueueDepth, openserMsgQueueMajorThreshold
+            kamailioMsgQueueDepth, kamailioMsgQueueMajorThreshold
         }
         STATUS  current
         DESCRIPTION
-        "The message queue depth (as reported by openserMsgQueueDepth) has 
-         exceeded the minor configured threshold openserMsgQueueMinorThreshold."
-        ::= { openserMIBNotifications 2 }
+        "The message queue depth (as reported by kamailioMsgQueueDepth) has 
+         exceeded the minor configured threshold kamailioMsgQueueMinorThreshold."
+        ::= { kamailioMIBNotifications 2 }
         
-    openserDialogLimitMinorEvent NOTIFICATION-TYPE
+    kamailioDialogLimitMinorEvent NOTIFICATION-TYPE
         OBJECTS {
-            openserCurNumDialogs, openserDialogLimitMinorThreshold
+            kamailioCurNumDialogs, kamailioDialogLimitMinorThreshold
         }
         STATUS  current
         DESCRIPTION
         "The number of dialogs being tracked in the system (as reported by
-         openserCurNumDialogs) has exceeded the minor configured threshold 
-         openserDialogLimitMinorThreshold."
-        ::= { openserMIBNotifications 3 }
+         kamailioCurNumDialogs) has exceeded the minor configured threshold 
+         kamailioDialogLimitMinorThreshold."
+        ::= { kamailioMIBNotifications 3 }
 
-    openserDialogLimitMajorEvent NOTIFICATION-TYPE
+    kamailioDialogLimitMajorEvent NOTIFICATION-TYPE
         OBJECTS {
-            openserCurNumDialogs, openserDialogLimitMajorThreshold
+            kamailioCurNumDialogs, kamailioDialogLimitMajorThreshold
         }
         STATUS  current
         DESCRIPTION
         "The number of dialogs being tracked in the system (as reported by
-         openserCurNumDialogs) has exceeded the major configured threshold 
-         openserDialogLimitMajorThreshold."
-        ::= { openserMIBNotifications 4 }
+         kamailioCurNumDialogs) has exceeded the major configured threshold 
+         kamailioDialogLimitMajorThreshold."
+        ::= { kamailioMIBNotifications 4 }
 
 
 --
@@ -556,103 +559,103 @@ OPENSER-MIB DEFINITIONS ::= BEGIN
 --
 -- Compliance Statements
 --
-    openserCompliance   MODULE-COMPLIANCE
+    kamailioCompliance   MODULE-COMPLIANCE
         STATUS      current
         DESCRIPTION
-            "The compliance statement for OpenSER in the SOMAvoice product."
+            "The compliance statement for Kamailio in the SOMAvoice product."
 
         MODULE -- this module
-            MANDATORY-GROUPS { openserX731Group,
-                               openserStatsGroup,
-                               openserAlarmsGroup,
-                               openserMsgQueueEvents,
-                               openserDialogLimitEvents }
-        ::= { openserConform 1 }
-
-    openserGroups  OBJECT-IDENTITY
+            MANDATORY-GROUPS { kamailioX731Group,
+                               kamailioStatsGroup,
+                               kamailioAlarmsGroup,
+                               kamailioMsgQueueEvents,
+                               kamailioDialogLimitEvents }
+        ::= { kamailioConform 1 }
+
+    kamailioGroups  OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for defining the conformance groups."
-        ::= { openserConform 2 }
+        ::= { kamailioConform 2 }
         
-    openserNotifications OBJECT-IDENTITY
+    kamailioNotifications OBJECT-IDENTITY
         STATUS current
         DESCRIPTION
         "Sub-tree for defining the conformance notifications."
-        ::= { openserConform 3 }
+        ::= { kamailioConform 3 }
 
 --
 -- Units of Conformance
 --
-    openserX731Group    OBJECT-GROUP
+    kamailioX731Group    OBJECT-GROUP
         OBJECTS {
-            openserDialogUsageState
+            kamailioDialogUsageState
         }
         STATUS  current
         DESCRIPTION
             "A collection of objects providing X.731 state and alarm status
-             information in OpenSER."
-        ::= { openserGroups 1 }
+             information in Kamailio."
+        ::= { kamailioGroups 1 }
 
-    openserStatsGroup   OBJECT-GROUP
+    kamailioStatsGroup   OBJECT-GROUP
         OBJECTS {
-            openserMsgQueueDepth,
-            openserMsgQueueMinorThreshold,
-            openserMsgQueueMajorThreshold,
-            openserDialogType,
-            openserDialogToUri,
-            openserDialogFromUri,
-            openserDialogState,
-            openserDialogStartTime,
-            openserDialogLastUpdateTime,
-            openserDialogExpiryTime,
-            openserCurNumDialogs,
-            openserCurNumDialogsInProgress,
-            openserCurNumDialogsInSetup,
-            openserTotalNumFailedDialogSetups,
-            openserDialogLimitMinorThreshold,
-            openserDialogLimitMajorThreshold,
-            openserTotalNumDialogSetups
+            kamailioMsgQueueDepth,
+            kamailioMsgQueueMinorThreshold,
+            kamailioMsgQueueMajorThreshold,
+            kamailioDialogType,
+            kamailioDialogToUri,
+            kamailioDialogFromUri,
+            kamailioDialogState,
+            kamailioDialogStartTime,
+            kamailioDialogLastUpdateTime,
+            kamailioDialogExpiryTime,
+            kamailioCurNumDialogs,
+            kamailioCurNumDialogsInProgress,
+            kamailioCurNumDialogsInSetup,
+            kamailioTotalNumFailedDialogSetups,
+            kamailioDialogLimitMinorThreshold,
+            kamailioDialogLimitMajorThreshold,
+            kamailioTotalNumDialogSetups
         }
         STATUS  current
         DESCRIPTION
-            "A collection of objects providing statistics in OpenSER."
-        ::= { openserGroups 2 }
+            "A collection of objects providing statistics in Kamailio."
+        ::= { kamailioGroups 2 }
 
-    openserAlarmsGroup   OBJECT-GROUP
+    kamailioAlarmsGroup   OBJECT-GROUP
         OBJECTS {
-            openserMsgQueueDepthAlarmStatus,
-            openserMsgQueueDepthMinorAlarm,
-            openserMsgQueueDepthMajorAlarm,
-            openserDialogLimitAlarmStatus,
-            openserDialogLimitMinorAlarm,
-            openserDialogLimitMajorAlarm
+            kamailioMsgQueueDepthAlarmStatus,
+            kamailioMsgQueueDepthMinorAlarm,
+            kamailioMsgQueueDepthMajorAlarm,
+            kamailioDialogLimitAlarmStatus,
+            kamailioDialogLimitMinorAlarm,
+            kamailioDialogLimitMajorAlarm
         }
         STATUS  current
         DESCRIPTION
             "A collection of objects providing stateful alarm information in
-             OpenSER."
-        ::= { openserGroups 3 }
+             Kamailio."
+        ::= { kamailioGroups 3 }
     
-    openserMsgQueueEvents   NOTIFICATION-GROUP
+    kamailioMsgQueueEvents   NOTIFICATION-GROUP
         NOTIFICATIONS {
-            openserMsgQueueDepthMinorEvent,
-            openserMsgQueueDepthMajorEvent
+            kamailioMsgQueueDepthMinorEvent,
+            kamailioMsgQueueDepthMajorEvent
         }
         STATUS current
         DESCRIPTION
             "A collection of events for the message queue depth."
-        ::= { openserNotifications 1 }
+        ::= { kamailioNotifications 1 }
 
-    openserDialogLimitEvents   NOTIFICATION-GROUP
+    kamailioDialogLimitEvents   NOTIFICATION-GROUP
         NOTIFICATIONS {
-            openserDialogLimitMinorEvent,
-            openserDialogLimitMajorEvent
+            kamailioDialogLimitMinorEvent,
+            kamailioDialogLimitMajorEvent
         }
         STATUS current
         DESCRIPTION
             "A collection of events for dialog tracking."
-        ::= { openserNotifications 2 }
+        ::= { kamailioNotifications 2 }
 
 END
 

modules_k/snmpstats/mibs/OPENSER-REG-MIB → modules_k/snmpstats/mibs/KAMAILIO-REG-MIB

@@ -1,5 +1,5 @@
 -- *******************************************************************
--- OPENSER-REG-MIB: Kamailio Global Registration MIB file
+-- KAMAILIO-REG-MIB: Kamailio Global Registration MIB file
 --
 -- Date of Creation: March 2006
 -- Mike Varley
@@ -14,21 +14,25 @@
 --
 -- *******************************************************************
 
-OPENSER-REG-MIB DEFINITIONS ::= BEGIN
+KAMAILIO-REG-MIB DEFINITIONS ::= BEGIN
 
 IMPORTS
     MODULE-IDENTITY,
     enterprises, OBJECT-IDENTITY
         FROM SNMPv2-SMI;
 
-openserRegMibModule MODULE-IDENTITY
-    LAST-UPDATED    "200909280430Z"
+kamailioRegMibModule MODULE-IDENTITY
+    LAST-UPDATED    "201301080430Z"
     ORGANIZATION    "Kamailio"
     CONTACT-INFO
         "http://www.kamailio.org open source project."
     DESCRIPTION
         "Kamailio Global Registration MIB"
 
+    REVISION "201301080430Z"
+    DESCRIPTION
+        "Moved MIB to the new product name Kamailio and renamed MIB as well as entries"
+
     REVISION "200909280430Z"
     DESCRIPTION
         "Moved the Kamailio MIBs from the experimental branch to the IANA
@@ -37,72 +41,72 @@ openserRegMibModule MODULE-IDENTITY
     REVISION "200603211200Z"
     DESCRIPTION
         "Initial Kamailio Mib Release"
-    ::= { openserModules 1 }
+    ::= { kamailioModules 1 }
 
 -- top level enterprise identification
-openser OBJECT-IDENTITY
+kamailio OBJECT-IDENTITY
     STATUS current
     DESCRIPTION 
     "The IANA has assigned enterprise branch 34352 to Kamailio."
     ::= { enterprises 34352 }
 
 -- namespace management sub-trees    
-openserReg OBJECT-IDENTITY
+kamailioReg OBJECT-IDENTITY
     STATUS current
     DESCRIPTION 
     "Sub-tree for identification of Modules and logical components."
-    ::= { openser 1 }
+    ::= { kamailio 1 }
 
-openserGeneric OBJECT-IDENTITY
+kamailioGeneric OBJECT-IDENTITY
     STATUS current
     DESCRIPTION 
     "Sub-tree for objects and events common to Kamailio products."
-    ::= { openser 2 }
+    ::= { kamailio 2 }
     
-openserProducts OBJECT-IDENTITY
+kamailioProducts OBJECT-IDENTITY
     STATUS current
     DESCRIPTION 
     "Sub-tree for objects and events for specific Kamailio products and modules."
-    ::= { openser 3 }
+    ::= { kamailio 3 }
     
 -- Agent implementation profiles: Agents which implement the product MIBs 
 -- can publish under this branch which portions they support or exclude.
-openserCaps OBJECT-IDENTITY
+kamailioCaps OBJECT-IDENTITY
     STATUS current
     DESCRIPTION 
     "Sub-tree for agent implementation profiles."
-    ::= { openser 4 }
+    ::= { kamailio 4 }
 
-openserReqs OBJECT-IDENTITY
+kamailioReqs OBJECT-IDENTITY
     STATUS current
     DESCRIPTION 
     "Sub-tree for Management Application module requirements."
-    ::= { openser 5 }
+    ::= { kamailio 5 }
     
 -- Experimental branch, for development
-openserExpr   OBJECT-IDENTITY
+kamailioExpr   OBJECT-IDENTITY
     STATUS current
     DESCRIPTION 
     "Sub-tree for experimental definitions and new development."
-    ::= { openser 6 }
+    ::= { kamailio 6 }
 
 
 --
 -- The Registration sub-tree
 --
-openserModules  OBJECT-IDENTITY
+kamailioModules  OBJECT-IDENTITY
     STATUS current
     DESCRIPTION 
     "Sub-tree to register the values assigned to modules with the 
      MODULE-IDENTITY construct. Core MIBs are registered under this branch."
-    ::= { openserReg 1 }
+    ::= { kamailioReg 1 }
 
-openserPlugins OBJECT-IDENTITY
+kamailioPlugins OBJECT-IDENTITY
     STATUS current
     DESCRIPTION
     "Sub-tree to register plugin modules. Plugins with their own specific MIBs
      are registered under this branch."
-    ::= {openserReg 2 }
+    ::= {kamailioReg 2 }
     
 --
 -- Generic Sub-tree: currently there are no generic object or event definitions
@@ -114,17 +118,17 @@ openserPlugins OBJECT-IDENTITY
 -- and events are defined.
 --
 
-openserCoreMIB  OBJECT-IDENTITY
+kamailioCoreMIB  OBJECT-IDENTITY
     STATUS current
     DESCRIPTION 
     "Sub-tree for all objects and events related to the core Kamailio MIBs"
-    ::= { openserProducts 1 }
+    ::= { kamailioProducts 1 }
 
-openserPluginMIB OBJECT-IDENTITY
+kamailioPluginMIB OBJECT-IDENTITY
     STATUS current
     DESCRIPTION 
     "Sub-tree for all objects and events related to plugins for Kamailio."
-    ::= { openserProducts 2 }
+    ::= { kamailioProducts 2 }
  
 --
 -- Agent Capabilities Sub-tree: currently there are no agent capability MIBs
@@ -150,24 +154,24 @@ openserPluginMIB OBJECT-IDENTITY
 -- if someone is looking to add a new module.
 --
 
--- openserRegMibModule ::= { openserModules 1 } is this files MODULE-IDENTITY
+-- kamailioRegMibModule ::= { kamailioModules 1 } is this files MODULE-IDENTITY
 
 -- The Text Conventions used by the Kamailio product tree.
-openserTcModule OBJECT IDENTIFIER ::= { openserModules 2 }
+kamailioTcModule OBJECT IDENTIFIER ::= { kamailioModules 2 }
 
 -- The Kamailio version of the SIP-COMMON-MIB.
-openserSIPCommonModule OBJECT IDENTIFIER ::= { openserModules 3 }
+kamailioSIPCommonModule OBJECT IDENTIFIER ::= { kamailioModules 3 }
 
 -- The Kamailio version of the SIP-SERVER-MIB.
-openserSIPServerModule OBJECT IDENTIFIER ::= { openserModules 4 }
+kamailioSIPServerModule OBJECT IDENTIFIER ::= { kamailioModules 4 }
 
 -- The Kamailio MIB Module, containing internal statistics and state
 -- information.
-openserModule OBJECT IDENTIFIER ::= { openserModules 5 }
+kamailioModule OBJECT IDENTIFIER ::= { kamailioModules 5 }
 
 --
 -- Plugin Module Registrations: add any Kamailio plugin MIB Module registrations
--- here, under openserPlugins.
+-- here, under kamailioPlugins.
 --
 
 --
@@ -175,29 +179,29 @@ openserModule OBJECT IDENTIFIER ::= { openserModules 5 }
 -- The MIB files will define objects that use the following as their parent.
 --
 
-openserSIPCommonMIB OBJECT-IDENTITY
+kamailioSIPCommonMIB OBJECT-IDENTITY
     STATUS current
     DESCRIPTION 
     "The Kamailio version of the SIP-COMMON-MIB. All objects and events are
      defined under this branch."
-    ::= { openserCoreMIB 1 }
+    ::= { kamailioCoreMIB 1 }
 
-openserSIPServerMIB OBJECT-IDENTITY
+kamailioSIPServerMIB OBJECT-IDENTITY
     STATUS current
     DESCRIPTION 
     "The Kamailio version of the SIP-SERVER-MIB. All objects and events are
      defined under this branch."
-    ::= { openserCoreMIB 2 }
+    ::= { kamailioCoreMIB 2 }
     
-openserMIB OBJECT-IDENTITY
+kamailioMIB OBJECT-IDENTITY
     STATUS current
     DESCRIPTION 
     "The Kamailio MIB object and event definitons."
-    ::= { openserCoreMIB 3 }
+    ::= { kamailioCoreMIB 3 }
 
 --
 -- Product Plugin MIBs: add any specific Kamailio plugin MIBs here, under 
--- openserPluginMIB
+-- kamailioPluginMIB
 --
 
 

modules_k/snmpstats/mibs/OPENSER-SIP-COMMON-MIB → modules_k/snmpstats/mibs/KAMAILIO-SIP-COMMON-MIB

@@ -1,6 +1,6 @@
 -- ***********************************************************************
 --
--- This MIB provides information related to the OpenSER SIP Router.
+-- This MIB provides information related to the Kamailio SIP Router.
 -- 
 -- Copyright (c) The Internet Society (2006)
 -- Ammendments (c) Soma Networks, Inc. (2006)
@@ -10,7 +10,7 @@
 
 
 
-OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
+KAMAILIO-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
 
    IMPORTS
         MODULE-IDENTITY,
@@ -32,24 +32,24 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
         SnmpAdminString
              FROM SNMP-FRAMEWORK-MIB
 
-        OpenSERSIPTransportProtocol,
-        OpenSERSIPMethodIdentifier,
-        OpenSERSIPEntityRole
-             FROM OPENSER-TC
+        KamailioSIPTransportProtocol,
+        KamailioSIPMethodIdentifier,
+        KamailioSIPEntityRole
+             FROM KAMAILIO-TC
 
-        openserModules, openserSIPCommonMIB
-             FROM OPENSER-REG-MIB
+        kamailioModules, kamailioSIPCommonMIB
+             FROM KAMAILIO-REG-MIB
 
         InetPortNumber, 
         InetAddressType,
         InetAddress
              FROM INET-ADDRESS-MIB;
 
-   openserSIPCommonModule MODULE-IDENTITY
+   kamailioSIPCommonModule MODULE-IDENTITY
         LAST-UPDATED "200603221200Z"
-        ORGANIZATION "OpenSER"
+        ORGANIZATION "Kamailio"
         CONTACT-INFO
-                "http://www.openser.org"
+                "http://www.kamailio.org"
         DESCRIPTION
              "Originally taken from the IETF Session Initiation Protocol 
               Working Group ([email protected]). The description is pulled from 
@@ -123,23 +123,23 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
         DESCRIPTION
              "Initial version of the IETF SOMA-SIP-COMMON-MIB module.
               This version published as part of RFC XXXX."
-        ::= { openserModules 3 }
+        ::= { kamailioModules 3 }
 
 --
 -- Top-Level Components of this MIB.
 --
 
-   openserSIPCommonObjects  OBJECT-IDENTITY
+   kamailioSIPCommonObjects  OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for accessible objects in the MIB."  
-        ::= { openserSIPCommonMIB 1 }
+        ::= { kamailioSIPCommonMIB 1 }
         
-   openserSIPCommonConform     OBJECT-IDENTITY
+   kamailioSIPCommonConform     OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for conformance specifications."  
-        ::= { openserSIPCommonMIB 2 }
+        ::= { kamailioSIPCommonMIB 2 }
 
 --
 -- This MIB contains objects that are common to all SIP entities.
@@ -148,64 +148,64 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
 --
 -- Common basic configuration
 --
-   openserSIPCommonCfgBase OBJECT-IDENTITY
+   kamailioSIPCommonCfgBase OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for common basic configurations." 
-        ::= { openserSIPCommonObjects 1 }
+        ::= { kamailioSIPCommonObjects 1 }
 
-   openserSIPCommonCfgTimer OBJECT-IDENTITY
+   kamailioSIPCommonCfgTimer OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Protocol timer configuration group." 
-        ::= { openserSIPCommonObjects 2 }
+        ::= { kamailioSIPCommonObjects 2 }
 
-   openserSIPCommonStatsSummary OBJECT-IDENTITY
+   kamailioSIPCommonStatsSummary OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "SIP message summary statistics group."
-        ::= { openserSIPCommonObjects 3 }
+        ::= { kamailioSIPCommonObjects 3 }
 
-   openserSIPCommonStatsMethod OBJECT-IDENTITY
+   kamailioSIPCommonStatsMethod OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Per method statistics group."
-        ::= { openserSIPCommonObjects 4 }
+        ::= { kamailioSIPCommonObjects 4 }
 
-   openserSIPCommonStatusCode OBJECT-IDENTITY
+   kamailioSIPCommonStatusCode OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Per Status code or status code class statistics group."
-        ::= { openserSIPCommonObjects 5 }
+        ::= { kamailioSIPCommonObjects 5 }
 
-   openserSIPCommonStatsTrans OBJECT-IDENTITY
+   kamailioSIPCommonStatsTrans OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Transaction statistics group."
-        ::= { openserSIPCommonObjects 6 }
+        ::= { kamailioSIPCommonObjects 6 }
 
-   openserSIPCommonStatsRetry   OBJECT-IDENTITY
+   kamailioSIPCommonStatsRetry   OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Method retry statistics group."
-        ::= { openserSIPCommonObjects 7 }
+        ::= { kamailioSIPCommonObjects 7 }
 
-   openserSIPCommonStatsOther   OBJECT-IDENTITY
+   kamailioSIPCommonStatsOther   OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Other statistics group."
-        ::= { openserSIPCommonObjects 8 }
+        ::= { kamailioSIPCommonObjects 8 }
 
-   openserSIPCommonNotifObjects  OBJECT-IDENTITY
+   kamailioSIPCommonNotifObjects  OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Accessible-for-notify objects group."
-        ::= { openserSIPCommonObjects 9 }
+        ::= { kamailioSIPCommonObjects 9 }
 
 --
 -- Common Configuration Objects
 --
-   openserSIPProtocolVersion OBJECT-TYPE
+   kamailioSIPProtocolVersion OBJECT-TYPE
        SYNTAX      SnmpAdminString
        MAX-ACCESS  read-only
        STATUS      current
@@ -218,9 +218,9 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
              dictated by the standard."
        REFERENCE
              "RFC 3261, Section 7.1"
-       ::= { openserSIPCommonCfgBase 1 }
+       ::= { kamailioSIPCommonCfgBase 1 }
 
-   openserSIPServiceStartTime OBJECT-TYPE
+   kamailioSIPServiceStartTime OBJECT-TYPE
        SYNTAX     TimeTicks
        MAX-ACCESS read-only
        STATUS     current
@@ -229,10 +229,10 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
              started. If started prior to the last re-initialization of
              the local network management subsystem, then this object
              contains a zero value."
-       ::= { openserSIPCommonCfgBase 2 }
+       ::= { kamailioSIPCommonCfgBase 2 }
 
-    openserSIPEntityType OBJECT-TYPE
-          SYNTAX     OpenSERSIPEntityRole
+    kamailioSIPEntityType OBJECT-TYPE
+          SYNTAX     KamailioSIPEntityRole
           MAX-ACCESS read-only
           STATUS     current
           DESCRIPTION
@@ -251,13 +251,13 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
 		 
                  other(0), userAgent(1), proxyServer(2), 
                  redirectServer(3), registrarServer(4)"
-       ::= { openserSIPCommonCfgBase 4 }
+       ::= { kamailioSIPCommonCfgBase 4 }
 
 --
 -- Support for multiple ports
 --
-   openserSIPPortTable OBJECT-TYPE
-       SYNTAX     SEQUENCE OF OpenSERSIPPortEntry
+   kamailioSIPPortTable OBJECT-TYPE
+       SYNTAX     SEQUENCE OF KamailioSIPPortEntry
        MAX-ACCESS not-accessible
        STATUS     current
        DESCRIPTION
@@ -265,10 +265,10 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
              in this system is allowed to use.  These ports can be
              advertised using the Contact header in a REGISTER request
              or response."
-       ::= { openserSIPCommonCfgBase 5 }
+       ::= { kamailioSIPCommonCfgBase 5 }
 
-   openserSIPPortEntry OBJECT-TYPE
-       SYNTAX     OpenSERSIPPortEntry
+   kamailioSIPPortEntry OBJECT-TYPE
+       SYNTAX     KamailioSIPPortEntry
        MAX-ACCESS not-accessible
        STATUS     current
        DESCRIPTION
@@ -277,49 +277,49 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
              Each row represents those objects for a particular SIP
              entity present in this system."
        INDEX {
-           openserSIPIPType,
-           openserSIPIPAddress,
-           openserSIPPort
+           kamailioSIPIPType,
+           kamailioSIPIPAddress,
+           kamailioSIPPort
            }
-       ::= { openserSIPPortTable 1 }
+       ::= { kamailioSIPPortTable 1 }
 
-   OpenSERSIPPortEntry ::=
+   KamailioSIPPortEntry ::=
        SEQUENCE {
-                openserSIPIPType               InetAddressType, 
-                openserSIPIPAddress            InetAddress,
-		openserSIPPort                 InetPortNumber,
-                openserSIPTransportRcv         OpenSERSIPTransportProtocol
+                kamailioSIPIPType               InetAddressType, 
+                kamailioSIPIPAddress            InetAddress,
+		kamailioSIPPort                 InetPortNumber,
+                kamailioSIPTransportRcv         KamailioSIPTransportProtocol
        }
 
    
-   openserSIPIPType    OBJECT-TYPE
+   kamailioSIPIPType    OBJECT-TYPE
        SYNTAX     InetAddressType
        MAX-ACCESS not-accessible
        STATUS     current
        DESCRIPTION 
            "This object tells us what the address format is for the next
 	    column"
-       ::= { openserSIPPortEntry 1 }
+       ::= { kamailioSIPPortEntry 1 }
 
-   openserSIPIPAddress OBJECT-TYPE 
+   kamailioSIPIPAddress OBJECT-TYPE 
        SYNTAX     InetAddress
        MAX-ACCESS not-accessible
        STATUS     current
        DESCRIPTION
             "This object shows which IP Address the row pertains to"
-       ::= { openserSIPPortEntry 2 } 
+       ::= { kamailioSIPPortEntry 2 } 
 
-   openserSIPPort OBJECT-TYPE
+   kamailioSIPPort OBJECT-TYPE
        SYNTAX     InetPortNumber
        MAX-ACCESS not-accessible
        STATUS     current
        DESCRIPTION
             "This object reflects a particular port that can be used by
              the SIP application."
-       ::= { openserSIPPortEntry 3 }
+       ::= { kamailioSIPPortEntry 3 }
 
-   openserSIPTransportRcv OBJECT-TYPE
-       SYNTAX     OpenSERSIPTransportProtocol
+   kamailioSIPTransportRcv OBJECT-TYPE
+       SYNTAX     KamailioSIPTransportProtocol
        MAX-ACCESS read-only
        STATUS     current
        DESCRIPTION
@@ -334,13 +334,13 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
              The bits are assigned as follows:
              
              other(0), udp(1), tcp(2), sctp(3), tls(4)"
-       ::= { openserSIPPortEntry 4 }
+       ::= { kamailioSIPPortEntry 4 }
 
    --
    -- Supported SIP Methods
    --
-   openserSIPMethodSupportedTable OBJECT-TYPE
-       SYNTAX     SEQUENCE OF OpenSERSIPMethodSupportedEntry
+   kamailioSIPMethodSupportedTable OBJECT-TYPE
+       SYNTAX     SEQUENCE OF KamailioSIPMethodSupportedEntry
        MAX-ACCESS not-accessible
        STATUS     current
        DESCRIPTION
@@ -359,10 +359,10 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
              advertised by the SIP entity in the Allow header (Section
              20.5 of RFC 3261) MUST be consistent with the methods
              reflected in this table."
-       ::= { openserSIPCommonCfgBase 7 }
+       ::= { kamailioSIPCommonCfgBase 7 }
 
-   openserSIPMethodSupportedEntry OBJECT-TYPE
-       SYNTAX     OpenSERSIPMethodSupportedEntry
+   kamailioSIPMethodSupportedEntry OBJECT-TYPE
+       SYNTAX     KamailioSIPMethodSupportedEntry
        MAX-ACCESS not-accessible
        STATUS     current
        DESCRIPTION
@@ -373,17 +373,17 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
 
              The objects in this table entry SHOULD be non-volatile
              and their value SHOULD be kept at reboot."
-       INDEX { openserSIPMethodSupportedIndex }
-       ::= { openserSIPMethodSupportedTable 1 }
+       INDEX { kamailioSIPMethodSupportedIndex }
+       ::= { kamailioSIPMethodSupportedTable 1 }
 
-   OpenSERSIPMethodSupportedEntry ::=
+   KamailioSIPMethodSupportedEntry ::=
        SEQUENCE {
-                openserSIPMethodSupportedIndex     OpenSERSIPMethodIdentifier,
-                openserSIPMethodName               SnmpAdminString
+                kamailioSIPMethodSupportedIndex     KamailioSIPMethodIdentifier,
+                kamailioSIPMethodName               SnmpAdminString
        }
 
-   openserSIPMethodSupportedIndex OBJECT-TYPE
-       SYNTAX     OpenSERSIPMethodIdentifier
+   kamailioSIPMethodSupportedIndex OBJECT-TYPE
+       SYNTAX     KamailioSIPMethodIdentifier
        MAX-ACCESS not-accessible
        STATUS     current
        DESCRIPTION
@@ -394,22 +394,22 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
              This identifier is suitable for referenceing the
              associated method throughout this and other MIBs
              supported by this managed system."
-       ::= { openserSIPMethodSupportedEntry 1 }
+       ::= { kamailioSIPMethodSupportedEntry 1 }
 
-   openserSIPMethodName OBJECT-TYPE
+   kamailioSIPMethodName OBJECT-TYPE
        SYNTAX SnmpAdminString
        MAX-ACCESS read-only
        STATUS current
        DESCRIPTION
             "This object reflects the supported method's name.
              The method name MUST be all upper case (eg, 'FOO')."
-       ::= { openserSIPMethodSupportedEntry 2 }
+       ::= { kamailioSIPMethodSupportedEntry 2 }
 
 
 --
 -- Summary Statistics
 --
-   openserSIPSummaryInRequests OBJECT-TYPE
+   kamailioSIPSummaryInRequests OBJECT-TYPE
        SYNTAX     Counter32
        MAX-ACCESS read-only
        STATUS     current
@@ -417,9 +417,9 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
             "This object indicates the total number of SIP request
              messages received by the SIP entity including
              retransmissions."
-       ::= { openserSIPCommonStatsSummary 1 }
+       ::= { kamailioSIPCommonStatsSummary 1 }
 
-   openserSIPSummaryOutRequests OBJECT-TYPE
+   kamailioSIPSummaryOutRequests OBJECT-TYPE
        SYNTAX     Counter32
        MAX-ACCESS read-only
        STATUS     current
@@ -429,9 +429,9 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
              entity.  Where a particular message is sent more than
              once, for example as a retransmission, or as a result of
              forking, each transmission is counted separately."
-       ::= { openserSIPCommonStatsSummary 2 }
+       ::= { kamailioSIPCommonStatsSummary 2 }
 
-   openserSIPSummaryInResponses OBJECT-TYPE
+   kamailioSIPSummaryInResponses OBJECT-TYPE
        SYNTAX     Counter32
        MAX-ACCESS read-only
        STATUS     current
@@ -439,9 +439,9 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
             "This object contains the total number of SIP response
              messages received by the SIP entity including
              retransmissions."
-       ::= { openserSIPCommonStatsSummary 3 }
+       ::= { kamailioSIPCommonStatsSummary 3 }
 
-   openserSIPSummaryOutResponses OBJECT-TYPE
+   kamailioSIPSummaryOutResponses OBJECT-TYPE
        SYNTAX     Counter32
        MAX-ACCESS read-only
        STATUS     current
@@ -449,9 +449,9 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
             "This object contains the total number of SIP response
              messages sent (originated and relayed) by the SIP entity
              including retransmissions."
-       ::= { openserSIPCommonStatsSummary 4 }
+       ::= { kamailioSIPCommonStatsSummary 4 }
 
-   openserSIPSummaryTotalTransactions OBJECT-TYPE
+   kamailioSIPSummaryTotalTransactions OBJECT-TYPE
        SYNTAX Counter32
        MAX-ACCESS read-only
        STATUS current
@@ -484,24 +484,24 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
 
              For a transaction stateless Proxy Server, this counter
              is always 0."
-       ::= { openserSIPCommonStatsSummary 5 }
+       ::= { kamailioSIPCommonStatsSummary 5 }
 
 --
 -- SIP Method Statistics
 -- Total counts for each SIP method.
 --
-   openserSIPMethodStatsTable OBJECT-TYPE
-       SYNTAX     SEQUENCE OF OpenSERSIPMethodStatsEntry
+   kamailioSIPMethodStatsTable OBJECT-TYPE
+       SYNTAX     SEQUENCE OF KamailioSIPMethodStatsEntry
        MAX-ACCESS not-accessible
        STATUS     current
        DESCRIPTION
             "This table contains the method statistics objects
              for SIP entities.  Each row represents those objects
              for a particular SIP entity present in this system."
-       ::= { openserSIPCommonStatsMethod 1 }
+       ::= { kamailioSIPCommonStatsMethod 1 }
 
-   openserSIPMethodStatsEntry OBJECT-TYPE
-       SYNTAX     OpenSERSIPMethodStatsEntry
+   kamailioSIPMethodStatsEntry OBJECT-TYPE
+       SYNTAX     KamailioSIPMethodStatsEntry
        MAX-ACCESS not-accessible
        STATUS     current
        DESCRIPTION
@@ -509,26 +509,26 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
 
              Each row represents those objects for a particular SIP
              entity present in this system."
-       INDEX { openserSIPStatsMethod }
-       ::= { openserSIPMethodStatsTable 1 }
+       INDEX { kamailioSIPStatsMethod }
+       ::= { kamailioSIPMethodStatsTable 1 }
 
-   OpenSERSIPMethodStatsEntry ::=
+   KamailioSIPMethodStatsEntry ::=
        SEQUENCE {
-                openserSIPStatsMethod       OpenSERSIPMethodIdentifier,
-                openserSIPStatsOutbounds    Counter32,
-                openserSIPStatsInbounds     Counter32
+                kamailioSIPStatsMethod       KamailioSIPMethodIdentifier,
+                kamailioSIPStatsOutbounds    Counter32,
+                kamailioSIPStatsInbounds     Counter32
        }
 
-   openserSIPStatsMethod OBJECT-TYPE
-       SYNTAX      OpenSERSIPMethodIdentifier
+   kamailioSIPStatsMethod OBJECT-TYPE
+       SYNTAX      KamailioSIPMethodIdentifier
        MAX-ACCESS  not-accessible
        STATUS      current
        DESCRIPTION
             "This object uniquely identifies the SIP method
              related to the objects in a particular row."
-       ::= { openserSIPMethodStatsEntry 1 }
+       ::= { kamailioSIPMethodStatsEntry 1 }
 
-   openserSIPStatsOutbounds OBJECT-TYPE
+   kamailioSIPStatsOutbounds OBJECT-TYPE
        SYNTAX      Counter32
        MAX-ACCESS  read-only
        STATUS      current
@@ -539,9 +539,9 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
              reflected in this counter."
        REFERENCE
             "RFC 3261, Section 7.1"
-       ::= { openserSIPMethodStatsEntry 2 }
+       ::= { kamailioSIPMethodStatsEntry 2 }
 
-   openserSIPStatsInbounds OBJECT-TYPE
+   kamailioSIPStatsInbounds OBJECT-TYPE
        SYNTAX      Counter32
        MAX-ACCESS  read-only
        STATUS      current
@@ -552,13 +552,13 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
              counter."
        REFERENCE
             "RFC 3261, Section 7.1"
-       ::= { openserSIPMethodStatsEntry 3 }
+       ::= { kamailioSIPMethodStatsEntry 3 }
 
 --
 -- Support for specific status codes
 --
-   openserSIPStatusCodesTable OBJECT-TYPE
-       SYNTAX      SEQUENCE OF OpenSERSIPStatusCodesEntry
+   kamailioSIPStatusCodesTable OBJECT-TYPE
+       SYNTAX      SEQUENCE OF KamailioSIPStatusCodesEntry
        MAX-ACCESS  not-accessible
        STATUS      current
        DESCRIPTION
@@ -566,10 +566,10 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
              each SIP entity in this system has been requested to
              monitor. It is the mechanism by which specific status
              codes are monitored."
-       ::= { openserSIPCommonStatusCode 1 }
+       ::= { kamailioSIPCommonStatusCode 1 }
 
-   openserSIPStatusCodesEntry OBJECT-TYPE
-       SYNTAX      OpenSERSIPStatusCodesEntry
+   kamailioSIPStatusCodesEntry OBJECT-TYPE
+       SYNTAX      KamailioSIPStatusCodesEntry
        MAX-ACCESS  not-accessible
        STATUS      current
        DESCRIPTION
@@ -579,29 +579,29 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
 
              Each row represents those objects for a particular SIP
              entity present in this system."
-       INDEX { openserSIPStatusCodeMethod, openserSIPStatusCodeValue }
-       ::= { openserSIPStatusCodesTable 1 }
+       INDEX { kamailioSIPStatusCodeMethod, kamailioSIPStatusCodeValue }
+       ::= { kamailioSIPStatusCodesTable 1 }
 
-   OpenSERSIPStatusCodesEntry ::=
+   KamailioSIPStatusCodesEntry ::=
        SEQUENCE {
-          openserSIPStatusCodeMethod     OpenSERSIPMethodIdentifier,
-          openserSIPStatusCodeValue      Unsigned32,
-          openserSIPStatusCodeIns        Counter32,
-          openserSIPStatusCodeOuts       Counter32,
-          openserSIPStatusCodeRowStatus  RowStatus
+          kamailioSIPStatusCodeMethod     KamailioSIPMethodIdentifier,
+          kamailioSIPStatusCodeValue      Unsigned32,
+          kamailioSIPStatusCodeIns        Counter32,
+          kamailioSIPStatusCodeOuts       Counter32,
+          kamailioSIPStatusCodeRowStatus  RowStatus
        }
 
-   openserSIPStatusCodeMethod OBJECT-TYPE
-       SYNTAX      OpenSERSIPMethodIdentifier
+   kamailioSIPStatusCodeMethod OBJECT-TYPE
+       SYNTAX      KamailioSIPMethodIdentifier
        MAX-ACCESS  not-accessible
        STATUS      current
        DESCRIPTION
             "This object uniquely identifies a conceptual row
              in the table and reflects an assigned number used
              to identifier a specific SIP method."
-       ::= { openserSIPStatusCodesEntry 1 }
+       ::= { kamailioSIPStatusCodesEntry 1 }
 
-   openserSIPStatusCodeValue OBJECT-TYPE
+   kamailioSIPStatusCodeValue OBJECT-TYPE
        SYNTAX      Unsigned32 (100..999)
        MAX-ACCESS  not-accessible
        STATUS      current
@@ -609,9 +609,9 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
             "This object contains a SIP status code value that the SIP
              entity has been requested to monitor.  All of the other
              information in the row is related to this value."
-       ::= { openserSIPStatusCodesEntry 2 }
+       ::= { kamailioSIPStatusCodesEntry 2 }
 
-   openserSIPStatusCodeIns OBJECT-TYPE
+   kamailioSIPStatusCodeIns OBJECT-TYPE
        SYNTAX      Counter32
        MAX-ACCESS  read-only
        STATUS      current
@@ -619,9 +619,9 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
             "This object reflects the total number of response messages
              received by the SIP entity with the status code value
              contained in the sipStatusCodeValue column."
-       ::= { openserSIPStatusCodesEntry 3 }
+       ::= { kamailioSIPStatusCodesEntry 3 }
 
-   openserSIPStatusCodeOuts OBJECT-TYPE
+   kamailioSIPStatusCodeOuts OBJECT-TYPE
        SYNTAX      Counter32
        MAX-ACCESS  read-only
        STATUS      current
@@ -629,9 +629,9 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
             "This object reflects the total number of response messages
              sent by the SIP entity with the status code value
              contained in the sipStatusCodeValue column."
-       ::= { openserSIPStatusCodesEntry 4 }
+       ::= { kamailioSIPStatusCodesEntry 4 }
 
-   openserSIPStatusCodeRowStatus OBJECT-TYPE
+   kamailioSIPStatusCodeRowStatus OBJECT-TYPE
        SYNTAX      RowStatus
        MAX-ACCESS  read-create
        STATUS      current
@@ -646,12 +646,12 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
              only valid values allowed for this object.
              If a row exists, it will reflect a status of
              'active' when queried."
-       ::= { openserSIPStatusCodesEntry 5 }
+       ::= { kamailioSIPStatusCodesEntry 5 }
 
 --
 -- Transaction Statistics
 --
-   openserSIPCurrentTransactions OBJECT-TYPE
+   kamailioSIPCurrentTransactions OBJECT-TYPE
        SYNTAX     Gauge32 (0..4294967295)
        MAX-ACCESS read-only
        STATUS     current
@@ -660,7 +660,7 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
              definitive (non-1xx) response.  In the case of a forked
              request, each branch counts as a single transaction
              corresponding to the entity identified by applIndex."
-   ::= { openserSIPCommonStatsTrans 1 }
+   ::= { kamailioSIPCommonStatsTrans 1 }
 
 --
 -- SIP Retry Statistics
@@ -668,17 +668,17 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
 -- This group contains various statistic objects about
 -- retransmission counts.
 --
-   openserSIPCommonStatsRetryTable OBJECT-TYPE
-       SYNTAX     SEQUENCE OF OpenSERSIPCommonStatsRetryEntry
+   kamailioSIPCommonStatsRetryTable OBJECT-TYPE
+       SYNTAX     SEQUENCE OF KamailioSIPCommonStatsRetryEntry
        MAX-ACCESS not-accessible
        STATUS     current
        DESCRIPTION
             "This table contains retry statistics objects applicable
              to each SIP entity in this system."
-       ::= { openserSIPCommonStatsRetry 1 }
+       ::= { kamailioSIPCommonStatsRetry 1 }
 
-   openserSIPCommonStatsRetryEntry OBJECT-TYPE
-       SYNTAX     OpenSERSIPCommonStatsRetryEntry
+   kamailioSIPCommonStatsRetryEntry OBJECT-TYPE
+       SYNTAX     KamailioSIPCommonStatsRetryEntry
        MAX-ACCESS not-accessible
        STATUS     current
        DESCRIPTION
@@ -686,27 +686,27 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
 
              Each row represents those objects for a particular SIP
              entity present in this system."
-       INDEX { openserSIPStatsRetryMethod }
-       ::= { openserSIPCommonStatsRetryTable 1 }
+       INDEX { kamailioSIPStatsRetryMethod }
+       ::= { kamailioSIPCommonStatsRetryTable 1 }
 
-   OpenSERSIPCommonStatsRetryEntry ::=
+   KamailioSIPCommonStatsRetryEntry ::=
        SEQUENCE {
-                openserSIPStatsRetryMethod           OpenSERSIPMethodIdentifier,
-                openserSIPStatsRetries                Counter32,
-                openserSIPStatsRetryFinalResponses    Counter32,
-                openserSIPStatsRetryNonFinalResponses Counter32
+                kamailioSIPStatsRetryMethod           KamailioSIPMethodIdentifier,
+                kamailioSIPStatsRetries                Counter32,
+                kamailioSIPStatsRetryFinalResponses    Counter32,
+                kamailioSIPStatsRetryNonFinalResponses Counter32
        }
 
-   openserSIPStatsRetryMethod OBJECT-TYPE
-       SYNTAX      OpenSERSIPMethodIdentifier
+   kamailioSIPStatsRetryMethod OBJECT-TYPE
+       SYNTAX      KamailioSIPMethodIdentifier
        MAX-ACCESS  not-accessible
        STATUS      current
        DESCRIPTION
             "This object uniquely identifies the SIP method
              related to the objects in a row."
-       ::= { openserSIPCommonStatsRetryEntry 1 }
+       ::= { kamailioSIPCommonStatsRetryEntry 1 }
 
-   openserSIPStatsRetries OBJECT-TYPE
+   kamailioSIPStatsRetries OBJECT-TYPE
        SYNTAX      Counter32
        MAX-ACCESS  read-only
        STATUS      current
@@ -715,9 +715,9 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
              retransmissions that have been sent by the SIP
              entity. Note that there could be multiple
              retransmissions per request."
-       ::= { openserSIPCommonStatsRetryEntry 2 }
+       ::= { kamailioSIPCommonStatsRetryEntry 2 }
 
-   openserSIPStatsRetryFinalResponses OBJECT-TYPE
+   kamailioSIPStatsRetryFinalResponses OBJECT-TYPE
        SYNTAX      Counter32
        MAX-ACCESS  read-only
        STATUS      current
@@ -726,21 +726,21 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
              retries that have been sent by the SIP entity.
              Note that there could be multiple retransmissions
              per request."
-       ::= { openserSIPCommonStatsRetryEntry 3 }
+       ::= { kamailioSIPCommonStatsRetryEntry 3 }
 
-   openserSIPStatsRetryNonFinalResponses OBJECT-TYPE
+   kamailioSIPStatsRetryNonFinalResponses OBJECT-TYPE
        SYNTAX      Counter32
        MAX-ACCESS  read-only
        STATUS      current
        DESCRIPTION
             "This object reflects the total number of non-Final Response
              retries that have been sent by the SIP entity."
-       ::= { openserSIPCommonStatsRetryEntry 4 }
+       ::= { kamailioSIPCommonStatsRetryEntry 4 }
 
 --
 -- Other Common Statistics
 --
-   openserSIPNumUnsupportedUris OBJECT-TYPE
+   kamailioSIPNumUnsupportedUris OBJECT-TYPE
        SYNTAX     Counter32
        MAX-ACCESS read-only
        STATUS     current
@@ -748,9 +748,9 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
             "Number of RequestURIs received with unsupported scheme.
              A server normally responds to such requests with a 400 Bad
              Request status code."
-       ::= { openserSIPCommonStatsOther 1 }
+       ::= { kamailioSIPCommonStatsOther 1 }
 
-   openserSIPNumUnsupportedMethods OBJECT-TYPE
+   kamailioSIPNumUnsupportedMethods OBJECT-TYPE
        SYNTAX     Counter32
        MAX-ACCESS read-only
        STATUS     current
@@ -758,16 +758,16 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
             "Number of SIP requests received with unsupported methods.
              A server normally responds to such requests with a
              501 (Not Implemented) or 405 (Method Not Allowed)."
-       ::= { openserSIPCommonStatsOther 2 }
+       ::= { kamailioSIPCommonStatsOther 2 }
 
-   openserSIPOtherwiseDiscardedMsgs OBJECT-TYPE
+   kamailioSIPOtherwiseDiscardedMsgs OBJECT-TYPE
        SYNTAX     Counter32
        MAX-ACCESS read-only
        STATUS     current
        DESCRIPTION
             "Number of SIP messages received that for any number
              of reasons was discarded without a response."
-       ::= { openserSIPCommonStatsOther 3 }
+       ::= { kamailioSIPCommonStatsOther 3 }
 
 --
 -- Conformance
@@ -776,78 +776,78 @@ OPENSER-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
 --
 -- Compliance Statements
 --
-   openserSIPCommonCompliance MODULE-COMPLIANCE
+   kamailioSIPCommonCompliance MODULE-COMPLIANCE
        STATUS     current
        DESCRIPTION
             "The compliance statement for SIP entities."
 
        MODULE -- this module
-            MANDATORY-GROUPS { openserSIPCommonConfigGroup,
-                               openserSIPCommonStatsGroup }
+            MANDATORY-GROUPS { kamailioSIPCommonConfigGroup,
+                               kamailioSIPCommonStatsGroup }
 
 
-       GROUP openserSIPCommonStatsRetryGroup
+       GROUP kamailioSIPCommonStatsRetryGroup
        DESCRIPTION
             "This group is OPTIONAL.  A SIP entity can elect to
              not provide any retry statistics."
-       ::= { openserSIPCommonConform 1 }
+       ::= { kamailioSIPCommonConform 1 }
 
-   openserSIPCommonGroups
-     OBJECT IDENTIFIER ::= { openserSIPCommonConform 2 }
+   kamailioSIPCommonGroups
+     OBJECT IDENTIFIER ::= { kamailioSIPCommonConform 2 }
 
 
 --
 -- Units of Conformance
 --
-   openserSIPCommonConfigGroup OBJECT-GROUP
+   kamailioSIPCommonConfigGroup OBJECT-GROUP
        OBJECTS {
-               openserSIPProtocolVersion,
-               openserSIPServiceStartTime,
-	       openserSIPPort,
-               openserSIPTransportRcv,
-	       openserSIPIPType,
-	       openserSIPIPAddress,
-               openserSIPEntityType,
-               openserSIPMethodName
+               kamailioSIPProtocolVersion,
+               kamailioSIPServiceStartTime,
+	       kamailioSIPPort,
+               kamailioSIPTransportRcv,
+	       kamailioSIPIPType,
+	       kamailioSIPIPAddress,
+               kamailioSIPEntityType,
+               kamailioSIPMethodName
        }
        STATUS  current
        DESCRIPTION
             "A collection of objects providing configuration common
              to all SIP enities."
-       ::= { openserSIPCommonGroups 1 }
+       ::= { kamailioSIPCommonGroups 1 }
 
-   openserSIPCommonStatsGroup OBJECT-GROUP
+   kamailioSIPCommonStatsGroup OBJECT-GROUP
        OBJECTS {
-               openserSIPSummaryInRequests,
-               openserSIPSummaryOutRequests,
-               openserSIPSummaryInResponses,
-               openserSIPSummaryOutResponses,
-               openserSIPSummaryTotalTransactions,
-               openserSIPStatsOutbounds,
-               openserSIPStatsInbounds,
-               openserSIPStatusCodeIns,
-               openserSIPStatusCodeOuts,
-               openserSIPStatusCodeRowStatus,
-               openserSIPCurrentTransactions,
-               openserSIPNumUnsupportedUris,
-               openserSIPNumUnsupportedMethods,
-               openserSIPOtherwiseDiscardedMsgs
+               kamailioSIPSummaryInRequests,
+               kamailioSIPSummaryOutRequests,
+               kamailioSIPSummaryInResponses,
+               kamailioSIPSummaryOutResponses,
+               kamailioSIPSummaryTotalTransactions,
+               kamailioSIPStatsOutbounds,
+               kamailioSIPStatsInbounds,
+               kamailioSIPStatusCodeIns,
+               kamailioSIPStatusCodeOuts,
+               kamailioSIPStatusCodeRowStatus,
+               kamailioSIPCurrentTransactions,
+               kamailioSIPNumUnsupportedUris,
+               kamailioSIPNumUnsupportedMethods,
+               kamailioSIPOtherwiseDiscardedMsgs
        }
        STATUS  current
        DESCRIPTION
             "A collection of objects providing statistics common
              to all SIP entities."
-       ::= { openserSIPCommonGroups 3 }
+       ::= { kamailioSIPCommonGroups 3 }
 
-   openserSIPCommonStatsRetryGroup OBJECT-GROUP
+   kamailioSIPCommonStatsRetryGroup OBJECT-GROUP
        OBJECTS {
-                openserSIPStatsRetries,
-                openserSIPStatsRetryFinalResponses,
-                openserSIPStatsRetryNonFinalResponses
+                kamailioSIPStatsRetries,
+                kamailioSIPStatsRetryFinalResponses,
+                kamailioSIPStatsRetryNonFinalResponses
        }
        STATUS  current
        DESCRIPTION
             "A collection of objects providing retry statistics."
-       ::= { openserSIPCommonGroups 4 }
+       ::= { kamailioSIPCommonGroups 4 }
 
    END

modules_k/snmpstats/mibs/OPENSER-SIP-SERVER-MIB → modules_k/snmpstats/mibs/KAMAILIO-SIP-SERVER-MIB

@@ -1,6 +1,6 @@
 -- ***********************************************************************
 --
--- This MIB provides information related to the OpenSER SIP Router.
+-- This MIB provides information related to the Kamailio SIP Router.
 -- 
 -- Copyright (c) The Internet Society (2006)
 -- Ammendments (c) Soma Networks, Inc. (2006)
@@ -9,7 +9,7 @@
 -- *****************************************************************
 
 
-OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
+KAMAILIO-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
 
       IMPORTS
            MODULE-IDENTITY,
@@ -32,15 +32,15 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
            SnmpAdminString
                 FROM SNMP-FRAMEWORK-MIB
 
-           openserModules, 
-           openserSIPServerMIB
-                FROM OPENSER-REG-MIB;
+           kamailioModules, 
+           kamailioSIPServerMIB
+                FROM KAMAILIO-REG-MIB;
 
-      openserSIPServerModule MODULE-IDENTITY
-           LAST-UPDATED   "200603281700Z"
-           ORGANIZATION   "OpenSER"
+      kamailioSIPServerModule MODULE-IDENTITY
+           LAST-UPDATED   "201301081000Z"
+           ORGANIZATION   "Kamailio"
            CONTACT-INFO
-                   "http://www.openser.org"
+                   "http://www.kamailio.org"
                    
            DESCRIPTION
                 "
@@ -101,43 +101,47 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
                   see the RFC itself for full legal notices."
               REVISION        "200603281700Z"
               DESCRIPTION
-                   "Added openserSIPRegUserLookupTable."
+                   "Added kamailioSIPRegUserLookupTable."
 
               REVISION        "200603231200Z"
               DESCRIPTION
-                   "made OpenSER specific and changed sipRegUserTable."
+                   "made Kamailio specific and changed sipRegUserTable."
                    
               REVISION        "200603021700Z"
               DESCRIPTION
                    "Initial version of the IETF SIP-SERVER-MIB module."
+
+              REVISION        "201301081000Z"
+              DESCRIPTION
+                   "Changed product name to Kamailio and renamed MIB entries and MIB itself"
            
-        ::= { openserModules 4 }
+        ::= { kamailioModules 4 }
 
 --
 -- Top-Level Components of this MIB.
 --
 
-      openserSIPServerObjects  OBJECT-IDENTITY
+      kamailioSIPServerObjects  OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for accessible objects in the MIB." 
-        ::= { openserSIPServerMIB 1 }
+        ::= { kamailioSIPServerMIB 1 }
         
-      openserSIPServerConform  OBJECT-IDENTITY
+      kamailioSIPServerConform  OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for conformance specifications." 
-        ::= { openserSIPServerMIB 2 }
+        ::= { kamailioSIPServerMIB 2 }
 
 --
 -- These groups contain objects common to all SIP servers.
 --
 
-      openserSIPServerCfg   OBJECT-IDENTITY
+      kamailioSIPServerCfg   OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for server configuration objects." 
-        ::= { openserSIPServerObjects 1 }
+        ::= { kamailioSIPServerObjects 1 }
 
 --
 -- Common Server Configuration Objects
@@ -147,22 +151,22 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
 -- This group contains MIB objects related to SIP Proxy Servers.
 --
     
-      openserSIPProxyCfg OBJECT-IDENTITY
+      kamailioSIPProxyCfg OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for proxy server configuration objects." 
-        ::= { openserSIPServerObjects 3 }
+        ::= { kamailioSIPServerObjects 3 }
       
-      openserSIPProxyStats    OBJECT-IDENTITY
+      kamailioSIPProxyStats    OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for proxy server statistics objects."  
-        ::= { openserSIPServerObjects 4 }
+        ::= { kamailioSIPServerObjects 4 }
 
 --
 -- Proxy Server Configuration
 --
-      openserSIPProxyStatefulness OBJECT-TYPE
+      kamailioSIPProxyStatefulness OBJECT-TYPE
           SYNTAX     INTEGER {
                               stateless(1),
                               transactionStateful(2),
@@ -198,10 +202,10 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
                 callStateful(3), the proxy is call stateful."
           REFERENCE
                 "RFC 3261, Section 16"
-          ::= { openserSIPProxyCfg 1 }
+          ::= { kamailioSIPProxyCfg 1 }
 
 
-      openserSIPProxyRecordRoute OBJECT-TYPE
+      kamailioSIPProxyRecordRoute OBJECT-TYPE
           SYNTAX     TruthValue
           MAX-ACCESS read-only
           STATUS     current
@@ -218,12 +222,12 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
                 not add itself to the Record-Route header."
           REFERENCE
                 "RFC 3261, Section 20.30"
-          ::= { openserSIPProxyCfg 3 }
+          ::= { kamailioSIPProxyCfg 3 }
 
 --
 -- Security
 --
-      openserSIPProxyAuthMethod OBJECT-TYPE
+      kamailioSIPProxyAuthMethod OBJECT-TYPE
           SYNTAX     BITS {
                              none(0),
                              tls(1),
@@ -240,13 +244,13 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
                 bit 2  HTTP Digest is used."
           REFERENCE
               "RFC 3261 Sections 22, 23, 26, 26.2.3"
-          ::= { openserSIPProxyCfg 4 }
+          ::= { kamailioSIPProxyCfg 4 }
 
 
 --
 -- Proxy Server Statistics
 --
-      openserSIPNumProxyRequireFailures OBJECT-TYPE
+      kamailioSIPNumProxyRequireFailures OBJECT-TYPE
           SYNTAX     Counter32
           MAX-ACCESS read-only
           STATUS     current
@@ -256,28 +260,28 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
                 Require headers.  Such occurrences result in a 420 Bad
                 Extension status code being
                 returned."
-          ::= { openserSIPProxyStats 1 }
+          ::= { kamailioSIPProxyStats 1 }
 
 --
 -- This group contains MIB objects related to SIP Registrars.
 --
-      openserSIPRegCfg OBJECT-IDENTITY
+      kamailioSIPRegCfg OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for SIP Registrar Configuration."
-        ::= { openserSIPServerObjects 5 }
+        ::= { kamailioSIPServerObjects 5 }
         
-      openserSIPRegStats OBJECT-IDENTITY
+      kamailioSIPRegStats OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for SIP Registrar Statistics." 
-        ::= { openserSIPServerObjects 6 }
+        ::= { kamailioSIPServerObjects 6 }
 
 --
 -- Registrar Configuration
 --
 
-      openserSIPRegMaxContactExpiryDuration OBJECT-TYPE
+      kamailioSIPRegMaxContactExpiryDuration OBJECT-TYPE
           SYNTAX     Unsigned32 (0..4294967295)
           UNITS      "seconds"
           MAX-ACCESS read-only
@@ -293,9 +297,9 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
                 of this object, then the contact information is given the
                 duration specified by this object, and that duration
                 is indicated to the User Agent in the response."
-          ::= { openserSIPRegCfg 2 }
+          ::= { kamailioSIPRegCfg 2 }
 
-      openserSIPRegMaxUsers OBJECT-TYPE
+      kamailioSIPRegMaxUsers OBJECT-TYPE
           SYNTAX     Unsigned32 (1..4294967295)
           MAX-ACCESS read-only
           STATUS     current
@@ -303,18 +307,18 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
                "This object reflects the maximum number of users that
                 the Registrar supports.  The current number of users is
                 reflected by sipRegCurrentUsers."
-          ::= { openserSIPRegCfg 3 }
+          ::= { kamailioSIPRegCfg 3 }
 
-      openserSIPRegCurrentUsers OBJECT-TYPE
+      kamailioSIPRegCurrentUsers OBJECT-TYPE
           SYNTAX     Gauge32 (0..4294967295)
           MAX-ACCESS read-only
           STATUS     current
           DESCRIPTION
                "This object reflects the number of users currently
                 registered with the Registrar."
-          ::= { openserSIPRegCfg 4 }
+          ::= { kamailioSIPRegCfg 4 }
 
-      openserSIPRegDfltRegActiveInterval OBJECT-TYPE
+      kamailioSIPRegDfltRegActiveInterval OBJECT-TYPE
           SYNTAX     Unsigned32 (1..4294967295)
           UNITS      "seconds"
           MAX-ACCESS read-only
@@ -334,22 +338,22 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
                 This object SHOULD be non-volatile and its value SHOULD
                 be kept at reboot."
           REFERENCE "RFC 3261, Section 10.2"
-          ::= { openserSIPRegCfg 5 }
+          ::= { kamailioSIPRegCfg 5 }
 
 --
 -- Per User Information
 --
-      openserSIPRegUserTable OBJECT-TYPE
-          SYNTAX     SEQUENCE OF OpenSERSIPRegUserEntry
+      kamailioSIPRegUserTable OBJECT-TYPE
+          SYNTAX     SEQUENCE OF KamailioSIPRegUserEntry
           MAX-ACCESS not-accessible
           STATUS     current
           DESCRIPTION
                "This table contains information on all users registered
                 to each Registrar in this system."
-          ::= { openserSIPRegCfg 6 }
+          ::= { kamailioSIPRegCfg 6 }
 
-      openserSIPRegUserEntry OBJECT-TYPE
-          SYNTAX     OpenSERSIPRegUserEntry
+      kamailioSIPRegUserEntry OBJECT-TYPE
+          SYNTAX     KamailioSIPRegUserEntry
           MAX-ACCESS not-accessible
           STATUS     current
           DESCRIPTION
@@ -358,26 +362,26 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
 
                 Each row represents those objects for a particular SIP
                 server present in this system."
-          INDEX { openserSIPUserIndex }
-          ::= { openserSIPRegUserTable 1 }
+          INDEX { kamailioSIPUserIndex }
+          ::= { kamailioSIPRegUserTable 1 }
 
-      OpenSERSIPRegUserEntry ::=
+      KamailioSIPRegUserEntry ::=
           SEQUENCE {
-                   openserSIPUserIndex                     Unsigned32,
-                   openserSIPUserUri                       SnmpAdminString,
-                   openserSIPUserAuthenticationFailures    Counter32
+                   kamailioSIPUserIndex                     Unsigned32,
+                   kamailioSIPUserUri                       SnmpAdminString,
+                   kamailioSIPUserAuthenticationFailures    Counter32
           }
 
-        openserSIPUserIndex OBJECT-TYPE
+        kamailioSIPUserIndex OBJECT-TYPE
              SYNTAX     Unsigned32 (1..4294967295)
              MAX-ACCESS not-accessible
              STATUS     current
              DESCRIPTION
                   "This object uniquely identifies a conceptual row in
                   the table."
-             ::= { openserSIPRegUserEntry 1 }
+             ::= { kamailioSIPRegUserEntry 1 }
              
-      openserSIPUserUri OBJECT-TYPE
+      kamailioSIPUserUri OBJECT-TYPE
           SYNTAX     SnmpAdminString
           MAX-ACCESS read-only
           STATUS     current
@@ -386,22 +390,22 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
                 is the main form by which the Registrar knows the user.
                 The format is typically 'user@domain'.  It is contained
                 in the To header for all REGISTER requests."
-          ::= { openserSIPRegUserEntry 2 }
+          ::= { kamailioSIPRegUserEntry 2 }
 
-      openserSIPUserAuthenticationFailures OBJECT-TYPE
+      kamailioSIPUserAuthenticationFailures OBJECT-TYPE
           SYNTAX     Counter32
           MAX-ACCESS read-only
           STATUS     current
           DESCRIPTION
                "This object contains a count of the number of times the
                 user has failed authentication."
-          ::= { openserSIPRegUserEntry 3 }
+          ::= { kamailioSIPRegUserEntry 3 }
 
 --
 -- Per Contact Information
 --
-      openserSIPContactTable OBJECT-TYPE
-          SYNTAX     SEQUENCE OF OpenSERSipContactEntry
+      kamailioSIPContactTable OBJECT-TYPE
+          SYNTAX     SEQUENCE OF KamailioSipContactEntry
           MAX-ACCESS not-accessible
           STATUS     current
           DESCRIPTION
@@ -409,38 +413,38 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
                 a registered user (specified by sipUserIndex) wishes to
                 be found (i.e. the user has provided Contact information
                 to each SIP Registrar in this system)."
-          ::= { openserSIPRegCfg 7 }
+          ::= { kamailioSIPRegCfg 7 }
 
-      openserSIPContactEntry OBJECT-TYPE
-          SYNTAX     OpenSERSipContactEntry
+      kamailioSIPContactEntry OBJECT-TYPE
+          SYNTAX     KamailioSipContactEntry
           MAX-ACCESS not-accessible
           STATUS     current
           DESCRIPTION
                "This entry contains information for a single Contact.
                 Multiple contacts may exist for a single user."
-          INDEX { openserSIPUserIndex, openserSIPContactIndex }
-          ::= { openserSIPContactTable 1 }
+          INDEX { kamailioSIPUserIndex, kamailioSIPContactIndex }
+          ::= { kamailioSIPContactTable 1 }
 
-      OpenSERSipContactEntry ::=
+      KamailioSipContactEntry ::=
           SEQUENCE {
-                   openserSIPContactIndex                Unsigned32,
-                   openserSIPContactDisplayName          SnmpAdminString,
-                   openserSIPContactURI                  SnmpAdminString,
-                   openserSIPContactLastUpdated          DateAndTime,
-                   openserSIPContactExpiry               DateAndTime,
-                   openserSIPContactPreference           SnmpAdminString
+                   kamailioSIPContactIndex                Unsigned32,
+                   kamailioSIPContactDisplayName          SnmpAdminString,
+                   kamailioSIPContactURI                  SnmpAdminString,
+                   kamailioSIPContactLastUpdated          DateAndTime,
+                   kamailioSIPContactExpiry               DateAndTime,
+                   kamailioSIPContactPreference           SnmpAdminString
           }
 
-      openserSIPContactIndex OBJECT-TYPE
+      kamailioSIPContactIndex OBJECT-TYPE
           SYNTAX     Unsigned32 (1..4294967295)
           MAX-ACCESS not-accessible
           STATUS     current
           DESCRIPTION
                "Along with the sipUserIndex, this object uniquely
                 identifies a conceptual row in the table."
-          ::= { openserSIPContactEntry 1 }
+          ::= { kamailioSIPContactEntry 1 }
 
-      openserSIPContactDisplayName OBJECT-TYPE
+      kamailioSIPContactDisplayName OBJECT-TYPE
           SYNTAX     SnmpAdminString
           MAX-ACCESS read-only
           STATUS     current
@@ -450,9 +454,9 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
                 corresponding to contact URIs of
                 sip:[email protected] or
                 sip:[email protected], respectively."
-          ::= { openserSIPContactEntry 2 }
+          ::= { kamailioSIPContactEntry 2 }
 
-      openserSIPContactURI OBJECT-TYPE
+      kamailioSIPContactURI OBJECT-TYPE
           SYNTAX     SnmpAdminString
           MAX-ACCESS read-only
           STATUS     current
@@ -462,9 +466,9 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
                 to a client from a Redirect Server, or is used as the
                 RequestURI in a SIP request line for requests forwarded
                 by a proxy."
-          ::= { openserSIPContactEntry 3 }
+          ::= { kamailioSIPContactEntry 3 }
 
-      openserSIPContactLastUpdated OBJECT-TYPE
+      kamailioSIPContactLastUpdated OBJECT-TYPE
           SYNTAX     DateAndTime
           MAX-ACCESS read-only
           STATUS     current
@@ -473,9 +477,9 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
                 information was accepted.  If the contact information
                 is updated via a subsequent REGISTER of the same
                 information, this object is also updated."
-          ::= { openserSIPContactEntry 4 }
+          ::= { kamailioSIPContactEntry 4 }
 
-      openserSIPContactExpiry OBJECT-TYPE
+      kamailioSIPContactExpiry OBJECT-TYPE
           SYNTAX     DateAndTime
           MAX-ACCESS read-only
           STATUS     current
@@ -485,9 +489,9 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
                 specified by the user at registration (Expires header
                 or expiry parameter in the Contact information), or a
                 system default can be applied."
-          ::= { openserSIPContactEntry 5 }
+          ::= { kamailioSIPContactEntry 5 }
 
-      openserSIPContactPreference OBJECT-TYPE
+      kamailioSIPContactPreference OBJECT-TYPE
           SYNTAX     SnmpAdminString
           MAX-ACCESS read-only
           STATUS     current
@@ -503,7 +507,7 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
                 locations preferred by the user."
           REFERENCE
                "RFC 3261, Section 10.2.1.2, 16.6 and 20.10"
-          ::= { openserSIPContactEntry 6 }
+          ::= { kamailioSIPContactEntry 6 }
 
 --
 -- The regUser lookup table. Clients can use this structure to do a search on 
@@ -528,7 +532,7 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
 -- get from the RegUserTable is consitent with what they expect; this is SNMP
 -- and there are no guarantees between requests.
 --
-      openserSIPRegUserLookupCounter OBJECT-TYPE
+      kamailioSIPRegUserLookupCounter OBJECT-TYPE
             SYNTAX      Counter32
             MAX-ACCESS  read-only
             STATUS      current
@@ -536,85 +540,85 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
                  "This is a monotonically increasing value that increases by 1
                   each time and SNMP-GET is performed on this object. Clients 
                   should read this object, then use the result as an index into
-                  the openserSIPRegUserLookupTable.
+                  the kamailioSIPRegUserLookupTable.
                   
                   This ensures that every row-set in the 
-                  openserSIPRegUserTable is unique, and each client request 
+                  kamailioSIPRegUserTable is unique, and each client request 
                   will have a unique index to use."
-            ::= { openserSIPRegCfg 8 }
+            ::= { kamailioSIPRegCfg 8 }
             
-       openserSIPRegUserLookupTable  OBJECT-TYPE
-          SYNTAX     SEQUENCE OF OpenSERSIPRegUserLookupEntry
+       kamailioSIPRegUserLookupTable  OBJECT-TYPE
+          SYNTAX     SEQUENCE OF KamailioSIPRegUserLookupEntry
           MAX-ACCESS not-accessible
           STATUS     current
           DESCRIPTION
                "This table contains the index mapping between a user's URI and
-                the index into the openserSIPRegUserTable.
+                the index into the kamailioSIPRegUserTable.
                 
                 To use this table, a client must first get an index by doing a
-                SNMP GET on openserSIPRegUserLookupCounter. Then it must do an
+                SNMP GET on kamailioSIPRegUserLookupCounter. Then it must do an
                 SNMP SET on this table and create a new row in the table: it
                 needs to set the index, the URI the client is looking for, and
                 set the row-status to createAndGo.
                 
                 Then the client can do an SNMP GET on this table with the 
                 aquired index. If the row-status is 'active', then the 
-                openserSIPRegUserIndex is the index into the 
-                openserSIPRegUserTable that has the specified URI (0 zero 
+                kamailioSIPRegUserIndex is the index into the 
+                kamailioSIPRegUserTable that has the specified URI (0 zero 
                 indicates no such URI). The client should then set the 
                 row-status to 'destroy' in order to clean up this entry. Note
                 that after some time the entry will be automatically removed
                 regardless."
-          ::= { openserSIPRegCfg 9 }
+          ::= { kamailioSIPRegCfg 9 }
 
-      openserSIPRegUserLookupEntry OBJECT-TYPE
-          SYNTAX     OpenSERSIPRegUserLookupEntry
+      kamailioSIPRegUserLookupEntry OBJECT-TYPE
+          SYNTAX     KamailioSIPRegUserLookupEntry
           MAX-ACCESS not-accessible
           STATUS     current
           DESCRIPTION
                "This entry contains a mapping from a given URI to the index in
-                the openserSIPRegUserTable."
-          INDEX { openserSIPRegUserLookupIndex }
-          ::= { openserSIPRegUserLookupTable 1 }
+                the kamailioSIPRegUserTable."
+          INDEX { kamailioSIPRegUserLookupIndex }
+          ::= { kamailioSIPRegUserLookupTable 1 }
 
-      OpenSERSIPRegUserLookupEntry ::=
+      kamailioSIPRegUserLookupEntry ::=
           SEQUENCE {
-                   openserSIPRegUserLookupIndex          Unsigned32,
-                   openserSIPRegUserLookupURI            SnmpAdminString,
-                   openserSIPRegUserIndex                Unsigned32,
-                   openserSIPRegUserLookupRowStatus      RowStatus
+                   kamailioSIPRegUserLookupIndex          Unsigned32,
+                   kamailioSIPRegUserLookupURI            SnmpAdminString,
+                   kamailioSIPRegUserIndex                Unsigned32,
+                   kamailioSIPRegUserLookupRowStatus      RowStatus
           }
 
-      openserSIPRegUserLookupIndex OBJECT-TYPE
+      kamailioSIPRegUserLookupIndex OBJECT-TYPE
           SYNTAX     Unsigned32
           MAX-ACCESS not-accessible
           STATUS     current
           DESCRIPTION
                "The specific lookup index for a client's request. Rows are 
                 automatically reaped, so this table remains small."
-          ::= { openserSIPRegUserLookupEntry 1 }
+          ::= { kamailioSIPRegUserLookupEntry 1 }
 
-      openserSIPRegUserLookupURI OBJECT-TYPE
+      kamailioSIPRegUserLookupURI OBJECT-TYPE
           SYNTAX     SnmpAdminString
           MAX-ACCESS read-create
           STATUS     current
           DESCRIPTION
-               "This object is the URI to locate in the openserSIPRegUserTable.
+               "This object is the URI to locate in the kamailioSIPRegUserTable.
                 The client must provide this data."
-          ::= { openserSIPRegUserLookupEntry 2 }
+          ::= { kamailioSIPRegUserLookupEntry 2 }
 
-      openserSIPRegUserIndex OBJECT-TYPE
+      kamailioSIPRegUserIndex OBJECT-TYPE
           SYNTAX     Unsigned32
           MAX-ACCESS read-only
           STATUS     current
           DESCRIPTION
                "This object is the index of the specified URI in the 
-                openserSIPRegUserTable. 0 (zero) indicates the URI is not in
-                the openserSIPRegUserTable. This value is provided by the agent
+                kamailioSIPRegUserTable. 0 (zero) indicates the URI is not in
+                the kamailioSIPRegUserTable. This value is provided by the agent
                 when the row-status is set to 'active'."
-          ::= { openserSIPRegUserLookupEntry 3 }
+          ::= { kamailioSIPRegUserLookupEntry 3 }
 
-      openserSIPRegUserLookupRowStatus OBJECT-TYPE
+      kamailioSIPRegUserLookupRowStatus OBJECT-TYPE
           SYNTAX     RowStatus
           MAX-ACCESS read-create
           STATUS     current
@@ -625,16 +629,16 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
                   notReady: the agent has not yet finished processing the 
                       request.
                   active: the agent has completed its search and populated the 
-                    openserSIPRegUserIndex column.
+                    kamailioSIPRegUserIndex column.
                   destroy: the client sets this value to indicate it has 
                     finished with the row. The agent will remove it from the 
                     table."
-          ::= { openserSIPRegUserLookupEntry 4 }
+          ::= { kamailioSIPRegUserLookupEntry 4 }
 
 --
 -- Registrar Statistics
 --
-      openserSIPRegAcceptedRegistrations OBJECT-TYPE
+      kamailioSIPRegAcceptedRegistrations OBJECT-TYPE
           SYNTAX     Counter32
           MAX-ACCESS read-only
           STATUS     current
@@ -644,133 +648,133 @@ OPENSER-SIP-SERVER-MIB DEFINITIONS ::= BEGIN
                 the Registrar.  This includes additions of new contact
                 information, refreshing contact information, as well as
                 requests for deletion of contact information."
-          ::= { openserSIPRegStats 1 }
+          ::= { kamailioSIPRegStats 1 }
 
-      openserSIPRegRejectedRegistrations OBJECT-TYPE
+      kamailioSIPRegRejectedRegistrations OBJECT-TYPE
           SYNTAX     Counter32
           MAX-ACCESS read-only
           STATUS     current
           DESCRIPTION
                "This object contains a count of the number REGISTER
                 requests that have been rejected by the Registrar."
-          ::= { openserSIPRegStats 2 }
+          ::= { kamailioSIPRegStats 2 }
 
 --
 -- Conformance
 --
-      openserSIPServerCompliances OBJECT-IDENTITY
+      kamailioSIPServerCompliances OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for server compliences."  
-        ::= { openserSIPServerConform 1 }
+        ::= { kamailioSIPServerConform 1 }
 
-      openserSIPServerGroups OBJECT-IDENTITY
+      kamailioSIPServerGroups OBJECT-IDENTITY
         STATUS current
         DESCRIPTION 
         "Sub-tree for server group compliences."
-        ::= { openserSIPServerConform 2 }
+        ::= { kamailioSIPServerConform 2 }
 
 --
 -- Compliance Statements
 --
-      openserSIPProxyServerCompliance MODULE-COMPLIANCE
+      kamailioSIPProxyServerCompliance MODULE-COMPLIANCE
           STATUS     current
           DESCRIPTION
                "The compliance statement for SIP entities acting
                 as Proxy Servers."
           MODULE -- this module
-               MANDATORY-GROUPS { openserSIPProxyConfigGroup,
-                                  openserSIPProxyStatsGroup }
-          ::= { openserSIPServerCompliances 1 }
+               MANDATORY-GROUPS { kamailioSIPProxyConfigGroup,
+                                  kamailioSIPProxyStatsGroup }
+          ::= { kamailioSIPServerCompliances 1 }
 
-      openserSIPRegistrarServerCompliance MODULE-COMPLIANCE
+      kamailioSIPRegistrarServerCompliance MODULE-COMPLIANCE
           STATUS     current
           DESCRIPTION
                "The compliance statement for SIP entities acting
                 as Registrars."
           MODULE -- this module
-               MANDATORY-GROUPS { openserSIPRegistrarConfigGroup,
-                                  openserSIPRegistrarStatsGroup }
-          GROUP openserSIPRegistrarUsersGroup
+               MANDATORY-GROUPS { kamailioSIPRegistrarConfigGroup,
+                                  kamailioSIPRegistrarStatsGroup }
+          GROUP kamailioSIPRegistrarUsersGroup
           DESCRIPTION
                "This is an optional group."
-          ::= { openserSIPServerCompliances 3 }
+          ::= { kamailioSIPServerCompliances 3 }
 
 --
 -- Units of Conformance
 --
 
-      openserSIPProxyConfigGroup OBJECT-GROUP
+      kamailioSIPProxyConfigGroup OBJECT-GROUP
           OBJECTS {
-                  openserSIPProxyStatefulness,
-                  openserSIPProxyRecordRoute,
-                  openserSIPProxyAuthMethod
+                  kamailioSIPProxyStatefulness,
+                  kamailioSIPProxyRecordRoute,
+                  kamailioSIPProxyAuthMethod
           }
           STATUS  current
           DESCRIPTION
                "A collection of objects providing configuration for
                 SIP Proxy servers."
-          ::= { openserSIPServerGroups 2 }
+          ::= { kamailioSIPServerGroups 2 }
 
-      openserSIPProxyStatsGroup OBJECT-GROUP
+      kamailioSIPProxyStatsGroup OBJECT-GROUP
           OBJECTS {
-                  openserSIPNumProxyRequireFailures
+                  kamailioSIPNumProxyRequireFailures
           }
           STATUS  current
           DESCRIPTION
                "A collection of objects providing statistics for
                 SIP Proxy servers."
-          ::= { openserSIPServerGroups 3 }
+          ::= { kamailioSIPServerGroups 3 }
 
-      openserSIPRegistrarConfigGroup OBJECT-GROUP
+      kamailioSIPRegistrarConfigGroup OBJECT-GROUP
           OBJECTS {
-                  openserSIPRegMaxContactExpiryDuration,
-                  openserSIPRegMaxUsers,
-                  openserSIPRegCurrentUsers,
-                  openserSIPRegDfltRegActiveInterval
+                  kamailioSIPRegMaxContactExpiryDuration,
+                  kamailioSIPRegMaxUsers,
+                  kamailioSIPRegCurrentUsers,
+                  kamailioSIPRegDfltRegActiveInterval
           }
           STATUS  current
           DESCRIPTION
                "A collection of objects providing configuration for
                 SIP Registrars."
-          ::= { openserSIPServerGroups 4 }
+          ::= { kamailioSIPServerGroups 4 }
 
-      openserSIPRegistrarStatsGroup OBJECT-GROUP
+      kamailioSIPRegistrarStatsGroup OBJECT-GROUP
           OBJECTS {
-                  openserSIPRegAcceptedRegistrations,
-                  openserSIPRegRejectedRegistrations
+                  kamailioSIPRegAcceptedRegistrations,
+                  kamailioSIPRegRejectedRegistrations
           }
           STATUS  current
           DESCRIPTION
                "A collection of objects providing statistics for
                 SIP Registrars."
-          ::= { openserSIPServerGroups 5 }
+          ::= { kamailioSIPServerGroups 5 }
 
-      openserSIPRegistrarUsersGroup OBJECT-GROUP
+      kamailioSIPRegistrarUsersGroup OBJECT-GROUP
           OBJECTS {
-                  openserSIPUserUri,
-                  openserSIPUserAuthenticationFailures,
-                  openserSIPContactDisplayName,
-                  openserSIPContactURI,
-                  openserSIPContactLastUpdated,
-                  openserSIPContactExpiry,
-                  openserSIPContactPreference
+                  kamailioSIPUserUri,
+                  kamailioSIPUserAuthenticationFailures,
+                  kamailioSIPContactDisplayName,
+                  kamailioSIPContactURI,
+                  kamailioSIPContactLastUpdated,
+                  kamailioSIPContactExpiry,
+                  kamailioSIPContactPreference
           }
           STATUS  current
           DESCRIPTION
                "A collection of objects related to registered users."
-          ::= {openserSIPServerGroups 6 }
+          ::= {kamailioSIPServerGroups 6 }
           
-      openserSIPRegistrarLookupGroup OBJECT-GROUP
+      kamailioSIPRegistrarLookupGroup OBJECT-GROUP
           OBJECTS {
-                  openserSIPRegUserLookupCounter,
-                  openserSIPRegUserLookupURI,
-                  openserSIPRegUserIndex,
-                  openserSIPRegUserLookupRowStatus
+                  kamailioSIPRegUserLookupCounter,
+                  kamailioSIPRegUserLookupURI,
+                  kamailioSIPRegUserIndex,
+                  kamailioSIPRegUserLookupRowStatus
           }
           STATUS  current
           DESCRIPTION
                "A collection of objects related to registered user lookups."
-          ::= {openserSIPServerGroups 7 }
+          ::= {kamailioSIPServerGroups 7 }
 
 END

modules_k/snmpstats/mibs/OPENSER-TC → modules_k/snmpstats/mibs/KAMAILIO-TC

@@ -1,5 +1,5 @@
 -- *******************************************************************
--- OPENSER-TC: OpenSER MIB Textual Conventions
+-- KAMAILIO-TC: Kamailio MIB Textual Conventions
 --
 -- Date of Creation: March 2006
 -- Mike Varley
@@ -10,7 +10,7 @@
 -- *******************************************************************
 
 
-OPENSER-TC DEFINITIONS ::= BEGIN
+KAMAILIO-TC DEFINITIONS ::= BEGIN
 
 IMPORTS
 	MODULE-IDENTITY,
@@ -18,25 +18,25 @@ IMPORTS
 		FROM SNMPv2-SMI
 	TEXTUAL-CONVENTION
 		FROM SNMPv2-TC
-	openserModules
-		FROM OPENSER-REG-MIB;
+	kamailioModules
+		FROM KAMAILIO-REG-MIB;
 
 
-openserTcModule MODULE-IDENTITY
-	LAST-UPDATED	"200603211200Z"
-	ORGANIZATION	"OpenSER"
+kamailioTcModule MODULE-IDENTITY
+	LAST-UPDATED	"201301081200Z"
+	ORGANIZATION	"Kamailio"
 	CONTACT-INFO
-		"http://www.openser.org"
+		"http://www.kamailio.org"
 	DESCRIPTION
-		"OpenSER Global Textual Conventions."
-	::={ openserModules 2 }
+		"Kamailio Global Textual Conventions."
+	::={ kamailioModules 2 }
 
 
 --
 -- SIP type descriptions, taken from SIP-TC in drafts-ietf-sip-mib-10.txt
 --
 
-OpenSERSIPTransportProtocol ::= TEXTUAL-CONVENTION
+KamailioSIPTransportProtocol ::= TEXTUAL-CONVENTION
            STATUS current
            DESCRIPTION
                 "This convention is a bit map.  Each bit represents a
@@ -62,7 +62,7 @@ OpenSERSIPTransportProtocol ::= TEXTUAL-CONVENTION
            }
 --         REFERENCE "RFC 3261, Section 18"
 
-OpenSERSIPEntityRole ::= TEXTUAL-CONVENTION
+KamailioSIPEntityRole ::= TEXTUAL-CONVENTION
            STATUS current
            DESCRIPTION
                 "This convention defines the role of a SIP entity.
@@ -78,7 +78,7 @@ OpenSERSIPEntityRole ::= TEXTUAL-CONVENTION
            }
 
 
-OpenSERSIPMethodIdentifier ::= TEXTUAL-CONVENTION
+KamailioSIPMethodIdentifier ::= TEXTUAL-CONVENTION
        STATUS current
        DESCRIPTION
             "This is an IETF Assigned Numbers Authority (IANA)

modules_k/snmpstats/snmpMIBNotifications.c

@@ -26,7 +26,7 @@
  * --------
  * 2006-11-23 initial version (jmagder)
  * 2007-02-16 Moved all OID registrations from the experimental branch to 
- *            OpenSER's IANA assigned enterprise branch. (jmagder)
+ *            Kamailio's IANA assigned enterprise branch. (jmagder)
  * 
  * Note: this file originally auto-generated by mib2c using
  *        : mib2c.notify.conf,v 5.3 2004/04/15 12:29:19 dts12 Exp $
@@ -47,44 +47,44 @@
 static oid snmptrap_oid[] = {1, 3, 6, 1, 6, 3, 1, 1, 4, 1, 0};
 
 /* 
- * Sends off an openserMsgQueueDepthMinorEvent trap to the master agent,
+ * Sends off an kamailioMsgQueueDepthMinorEvent trap to the master agent,
  * assigning the following variable bindings:
  *
- *  - openserMsgQueueDepth          = msgQueueDepth
- *  - openserMsgQueueMinorThreshold = minorThreshold
+ *  - kamailioMsgQueueDepth          = msgQueueDepth
+ *  - kamailioMsgQueueMinorThreshold = minorThreshold
  *
  */
-int send_openserMsgQueueDepthMinorEvent_trap(int msgQueueDepth, 
+int send_kamailioMsgQueueDepthMinorEvent_trap(int msgQueueDepth, 
 		int minorThreshold)
 {
 	netsnmp_variable_list  *var_list = NULL;
 	
-	oid openserMsgQueueDepthMinorEvent_oid[] = { 
-		OPENSER_OID,3,1,3,2,0,1 };
+	oid kamailioMsgQueueDepthMinorEvent_oid[] = { 
+		KAMAILIO_OID,3,1,3,2,0,1 };
 
-	oid openserMsgQueueDepth_oid[]		 = { 
-		OPENSER_OID,3,1,3,1,2,3,1,0 };
+	oid kamailioMsgQueueDepth_oid[]		 = { 
+		KAMAILIO_OID,3,1,3,1,2,3,1,0 };
 
-	oid openserMsgQueueMinorThreshold_oid[]  = { 
-		OPENSER_OID,3,1,3,1,2,3,2,0 };
+	oid kamailioMsgQueueMinorThreshold_oid[]  = { 
+		KAMAILIO_OID,3,1,3,1,2,3,2,0 };
 
 	snmp_varlist_add_variable(&var_list,
 			snmptrap_oid, 
 			OID_LENGTH(snmptrap_oid),
 			ASN_OBJECT_ID,
-			(u_char *)openserMsgQueueDepthMinorEvent_oid, 
-			(int)sizeof(openserMsgQueueDepthMinorEvent_oid));
+			(u_char *)kamailioMsgQueueDepthMinorEvent_oid, 
+			(int)sizeof(kamailioMsgQueueDepthMinorEvent_oid));
 	
 	snmp_varlist_add_variable(&var_list,
-			openserMsgQueueDepth_oid, 
-			OID_LENGTH(openserMsgQueueDepth_oid),
+			kamailioMsgQueueDepth_oid, 
+			OID_LENGTH(kamailioMsgQueueDepth_oid),
 			ASN_GAUGE,
 			(u_char *)&msgQueueDepth, 
 			sizeof(msgQueueDepth));
 
 	snmp_varlist_add_variable(&var_list,
-			openserMsgQueueMinorThreshold_oid, 
-			OID_LENGTH(openserMsgQueueMinorThreshold_oid),
+			kamailioMsgQueueMinorThreshold_oid, 
+			OID_LENGTH(kamailioMsgQueueMinorThreshold_oid),
 			ASN_INTEGER,
 			(u_char *)&minorThreshold,
 			sizeof(minorThreshold));
@@ -96,44 +96,44 @@ int send_openserMsgQueueDepthMinorEvent_trap(int msgQueueDepth,
 }
 
 /*
- * Sends off an openserMsgQueueDepthMajorEvent trap to the master agent,
+ * Sends off an kamailioMsgQueueDepthMajorEvent trap to the master agent,
  * assigning the following variable bindings:
  *
- *  - openserMsgQueueDepth          = msgQueueDepth
- *  - openserMsgQueueMajorThreshold = majorThreshold
+ *  - kamailioMsgQueueDepth          = msgQueueDepth
+ *  - kamailioMsgQueueMajorThreshold = majorThreshold
  *
  */
-int send_openserMsgQueueDepthMajorEvent_trap(int msgQueueDepth, 
+int send_kamailioMsgQueueDepthMajorEvent_trap(int msgQueueDepth, 
 		int majorThreshold)
 {
 	netsnmp_variable_list  *var_list = NULL;
 
-	oid openserMsgQueueDepthMajorEvent_oid[] = { 
-		OPENSER_OID,3,1,3,2,0,2 };
+	oid kamailioMsgQueueDepthMajorEvent_oid[] = { 
+		KAMAILIO_OID,3,1,3,2,0,2 };
 
-	oid openserMsgQueueDepth_oid[]		 = {
-		OPENSER_OID,3,1,3,1,2,3,1,0 };
+	oid kamailioMsgQueueDepth_oid[]		 = {
+		KAMAILIO_OID,3,1,3,1,2,3,1,0 };
 
-	oid openserMsgQueueMajorThreshold_oid[]  = { 
-		OPENSER_OID,3,1,3,1,2,3,3,0 };
+	oid kamailioMsgQueueMajorThreshold_oid[]  = { 
+		KAMAILIO_OID,3,1,3,1,2,3,3,0 };
 
 	snmp_varlist_add_variable(&var_list, 
 		snmptrap_oid,
 		OID_LENGTH(snmptrap_oid), 
 		ASN_OBJECT_ID,
-		(u_char *)openserMsgQueueDepthMajorEvent_oid,
-		(int)sizeof(openserMsgQueueDepthMajorEvent_oid));
+		(u_char *)kamailioMsgQueueDepthMajorEvent_oid,
+		(int)sizeof(kamailioMsgQueueDepthMajorEvent_oid));
 	
 	snmp_varlist_add_variable(&var_list, 
-			openserMsgQueueDepth_oid,
-			OID_LENGTH(openserMsgQueueDepth_oid),
+			kamailioMsgQueueDepth_oid,
+			OID_LENGTH(kamailioMsgQueueDepth_oid),
 			ASN_GAUGE,
 			(u_char *)&msgQueueDepth, 
 			sizeof(msgQueueDepth));
 
 	snmp_varlist_add_variable(&var_list,
-			openserMsgQueueMajorThreshold_oid,
-			OID_LENGTH(openserMsgQueueMajorThreshold_oid),
+			kamailioMsgQueueMajorThreshold_oid,
+			OID_LENGTH(kamailioMsgQueueMajorThreshold_oid),
 			ASN_INTEGER,
 			(u_char *)&majorThreshold,
 			sizeof(majorThreshold));
@@ -146,43 +146,43 @@ int send_openserMsgQueueDepthMajorEvent_trap(int msgQueueDepth,
 
 
 /*
- * Sends off an openserDialogLimitMinorEvent trap to the master agent,
+ * Sends off an kamailioDialogLimitMinorEvent trap to the master agent,
  * assigning the following variable bindings:
  *
- *  - openserCurNumDialogs             = numDialogs
- *  - openserDialogLimitMinorThreshold = threshold
+ *  - kamailioCurNumDialogs             = numDialogs
+ *  - kamailioDialogLimitMinorThreshold = threshold
  *
  */
-int send_openserDialogLimitMinorEvent_trap(int numDialogs, int threshold)
+int send_kamailioDialogLimitMinorEvent_trap(int numDialogs, int threshold)
 {
 	netsnmp_variable_list  *var_list = NULL;
 
-	oid openserDialogLimitMinorEvent_oid[]    = { 
-		OPENSER_OID,3,1,3,2,0,3 };
+	oid kamailioDialogLimitMinorEvent_oid[]    = { 
+		KAMAILIO_OID,3,1,3,2,0,3 };
 	
-	oid openserCurNumDialogs_oid[]            = { 
-		OPENSER_OID,3,1,3,1,3,2,1, 0 };
+	oid kamailioCurNumDialogs_oid[]            = { 
+		KAMAILIO_OID,3,1,3,1,3,2,1, 0 };
 	
-	oid openserDialogLimitMinorThreshold_oid[] = { 
-		OPENSER_OID,3,1,3,1,3,2,5, 0 };
+	oid kamailioDialogLimitMinorThreshold_oid[] = { 
+		KAMAILIO_OID,3,1,3,1,3,2,5, 0 };
 
 	snmp_varlist_add_variable(&var_list,
 		snmptrap_oid,
 		OID_LENGTH(snmptrap_oid), 
 		ASN_OBJECT_ID,
-		(u_char *)openserDialogLimitMinorEvent_oid,
-		(int)sizeof(openserDialogLimitMinorEvent_oid));
+		(u_char *)kamailioDialogLimitMinorEvent_oid,
+		(int)sizeof(kamailioDialogLimitMinorEvent_oid));
 	
 	snmp_varlist_add_variable(&var_list,
-		openserCurNumDialogs_oid, 
-		OID_LENGTH(openserCurNumDialogs_oid),
+		kamailioCurNumDialogs_oid, 
+		OID_LENGTH(kamailioCurNumDialogs_oid),
 		ASN_GAUGE,
 		(u_char *)&numDialogs,
 		sizeof(numDialogs));
 
 	snmp_varlist_add_variable(&var_list,
-		openserDialogLimitMinorThreshold_oid, 
-		OID_LENGTH(openserDialogLimitMinorThreshold_oid),
+		kamailioDialogLimitMinorThreshold_oid, 
+		OID_LENGTH(kamailioDialogLimitMinorThreshold_oid),
 		ASN_INTEGER,
 		(u_char *)&threshold,
 		sizeof(threshold));
@@ -195,43 +195,43 @@ int send_openserDialogLimitMinorEvent_trap(int numDialogs, int threshold)
 
 
 /*
- * Sends off an openserDialogLimitMinorEvent trap to the master agent,
+ * Sends off an kamailioDialogLimitMinorEvent trap to the master agent,
  * assigning the following variable bindings:
  *
- *  - openserCurNumDialogs             = numDialogs
- *  - openserDialogLimitMinorThreshold = threshold
+ *  - kamailioCurNumDialogs             = numDialogs
+ *  - kamailioDialogLimitMinorThreshold = threshold
  *
  */
-int send_openserDialogLimitMajorEvent_trap(int numDialogs, int threshold)
+int send_kamailioDialogLimitMajorEvent_trap(int numDialogs, int threshold)
 {
 	netsnmp_variable_list  *var_list = NULL;
 
-	oid openserDialogLimitMajorEvent_oid[]     = { 
-		OPENSER_OID,3,1,3,2,0,4 };
+	oid kamailioDialogLimitMajorEvent_oid[]     = { 
+		KAMAILIO_OID,3,1,3,2,0,4 };
 
-	oid openserCurNumDialogs_oid[]             = { 
-		OPENSER_OID,3,1,3,1,3,2,1, 0 };
+	oid kamailioCurNumDialogs_oid[]             = { 
+		KAMAILIO_OID,3,1,3,1,3,2,1, 0 };
 
-	oid openserDialogLimitMajorThreshold_oid[] = { 
-		OPENSER_OID,3,1,3,1,3,2,6, 0 };
+	oid kamailioDialogLimitMajorThreshold_oid[] = { 
+		KAMAILIO_OID,3,1,3,1,3,2,6, 0 };
 
 	snmp_varlist_add_variable(&var_list,
 		snmptrap_oid, 
 		OID_LENGTH(snmptrap_oid),
 		ASN_OBJECT_ID,
-		(u_char *)openserDialogLimitMajorEvent_oid, 
-		(int)sizeof(openserDialogLimitMajorEvent_oid));
+		(u_char *)kamailioDialogLimitMajorEvent_oid, 
+		(int)sizeof(kamailioDialogLimitMajorEvent_oid));
 	
 	snmp_varlist_add_variable(&var_list,
-		openserCurNumDialogs_oid, 
-		OID_LENGTH(openserCurNumDialogs_oid),
+		kamailioCurNumDialogs_oid, 
+		OID_LENGTH(kamailioCurNumDialogs_oid),
 		ASN_GAUGE,
 		(u_char *)&numDialogs,
 		sizeof(numDialogs));
 
 	snmp_varlist_add_variable(&var_list,
-		openserDialogLimitMajorThreshold_oid, 
-		OID_LENGTH(openserDialogLimitMajorThreshold_oid),
+		kamailioDialogLimitMajorThreshold_oid, 
+		OID_LENGTH(kamailioDialogLimitMajorThreshold_oid),
 		ASN_INTEGER,
 		(u_char *)&threshold,
 		sizeof(threshold));

modules_k/snmpstats/snmpMIBNotifications.h

@@ -34,50 +34,50 @@
  *
  */
 
-#ifndef OPENSERMIBNOTIFICATIONS_H
-#define OPENSERMIBNOTIFICATIONS_H
+#ifndef KAMAILIOMIBNOTIFICATIONS_H
+#define KAMAILIOMIBNOTIFICATIONS_H
 
 
 /* 
- * Sends off an openserMsgQueueDepthMinorEvent trap to the master agent,
+ * Sends off an kamailioMsgQueueDepthMinorEvent trap to the master agent,
  * assigning the following variable bindings:
  *
- *  - openserMsgQueueDepth          = msgQueueDepth
- *  - openserMsgQueueMinorThreshold = minorThreshold
+ *  - kamailioMsgQueueDepth          = msgQueueDepth
+ *  - kamailioMsgQueueMinorThreshold = minorThreshold
  *
  */
-int send_openserMsgQueueDepthMinorEvent_trap(int msgQueueDepth, 
+int send_kamailioMsgQueueDepthMinorEvent_trap(int msgQueueDepth, 
 		int minorThreshold);
 
 /*
- * Sends off an openserMsgQueueDepthMajorEvent trap to the master agent,
+ * Sends off an kamailioMsgQueueDepthMajorEvent trap to the master agent,
  * assigning the following variable bindings:
  *
- *  - openserMsgQueueDepth          = msgQueueDepth
- *  - openserMsgQueueMajorThreshold = majorThreshold
+ *  - kamailioMsgQueueDepth          = msgQueueDepth
+ *  - kamailioMsgQueueMajorThreshold = majorThreshold
  *
  */
-int send_openserMsgQueueDepthMajorEvent_trap(int msgQueueDepth, 
+int send_kamailioMsgQueueDepthMajorEvent_trap(int msgQueueDepth, 
 		int majorThreshold);
 
 /*
- * Sends off an openserDialogLimitMinorEvent trap to the master agent,
+ * Sends off an kamailioDialogLimitMinorEvent trap to the master agent,
  * assigning the following variable bindings:
  *
- *  - openserCurNumDialogs             = numDialogs
- *  - openserDialogLimitMinorThreshold = threshold
+ *  - kamailioCurNumDialogs             = numDialogs
+ *  - kamailioDialogLimitMinorThreshold = threshold
  *
  */
-int send_openserDialogLimitMinorEvent_trap(int numDialogs, int threshold);
+int send_kamailioDialogLimitMinorEvent_trap(int numDialogs, int threshold);
 
 /*
- * Sends off an openserDialogLimitMinorEvent trap to the master agent,
+ * Sends off an kamailioDialogLimitMinorEvent trap to the master agent,
  * assigning the following variable bindings:
  *
- *  - openserCurNumDialogs             = numDialogs
- *  - openserDialogLimitMinorThreshold = threshold
+ *  - kamailioCurNumDialogs             = numDialogs
+ *  - kamailioDialogLimitMinorThreshold = threshold
  *
  */
-int send_openserDialogLimitMajorEvent_trap(int numDialogs, int threshold);
+int send_kamailioDialogLimitMajorEvent_trap(int numDialogs, int threshold);
 
-#endif /* OPENSERMIBNOTIFICATIONS_H */
+#endif /* KAMAILIOMIBNOTIFICATIONS_H */

modules_k/snmpstats/snmpObjects.c

@@ -32,7 +32,7 @@
  *		: mib2c.scalar.conf,v 1.9 2005/01/07 09:37:18 dts12 Exp $
  *
  * This file defines all registration and handling of all scalars defined in the
- * OPENSER-MIB.  Please see OPENSER-MIB for the complete descriptions of the
+ * KAMAILIO-MIB.  Please see KAMAILIO-MIB for the complete descriptions of the
  * individual scalars.
  */
 
@@ -49,219 +49,219 @@
 #include "alarm_checks.h"
 
 /* 
- * Initializes the openserObjects module.  This involves:
+ * Initializes the kamailioObjects module.  This involves:
  *
  *  - Registering all OID's
  *  - Setting up handlers for all OID's
  *
  * This function is mostly auto-generated.
  */
-void init_openserObjects(void)
+void init_kamailioObjects(void)
 {
-	static oid openserMsgQueueDepth_oid[]            =  
-		{ OPENSER_OID,3,1,3,1,2,3,1 };
+	static oid kamailioMsgQueueDepth_oid[]            =  
+		{ KAMAILIO_OID,3,1,3,1,2,3,1 };
 
-	static oid openserMsgQueueMinorThreshold_oid[]   = 
-		{ OPENSER_OID,3,1,3,1,2,3,2 };
+	static oid kamailioMsgQueueMinorThreshold_oid[]   = 
+		{ KAMAILIO_OID,3,1,3,1,2,3,2 };
 
-	static oid openserMsgQueueMajorThreshold_oid[]   = 
-		{ OPENSER_OID,3,1,3,1,2,3,3 };
+	static oid kamailioMsgQueueMajorThreshold_oid[]   = 
+		{ KAMAILIO_OID,3,1,3,1,2,3,3 };
 
-	static oid openserMsgQueueDepthAlarmStatus_oid[] = 
-		{ OPENSER_OID,3,1,3,1,2,4,1 };
+	static oid kamailioMsgQueueDepthAlarmStatus_oid[] = 
+		{ KAMAILIO_OID,3,1,3,1,2,4,1 };
   
-  	static oid openserMsgQueueDepthMinorAlarm_oid[]  = 
-		{ OPENSER_OID,3,1,3,1,2,4,2 };
+  	static oid kamailioMsgQueueDepthMinorAlarm_oid[]  = 
+		{ KAMAILIO_OID,3,1,3,1,2,4,2 };
 
-	static oid openserMsgQueueDepthMajorAlarm_oid[]  = 
-		{ OPENSER_OID,3,1,3,1,2,4,3 };
+	static oid kamailioMsgQueueDepthMajorAlarm_oid[]  = 
+		{ KAMAILIO_OID,3,1,3,1,2,4,3 };
 
-	static oid openserCurNumDialogs_oid[]            = 
-		{ OPENSER_OID,3,1,3,1,3,2,1 };
+	static oid kamailioCurNumDialogs_oid[]            = 
+		{ KAMAILIO_OID,3,1,3,1,3,2,1 };
 
-	static oid openserCurNumDialogsInProgress_oid[]  = 
-		{ OPENSER_OID,3,1,3,1,3,2,2 };
+	static oid kamailioCurNumDialogsInProgress_oid[]  = 
+		{ KAMAILIO_OID,3,1,3,1,3,2,2 };
 
-	static oid openserCurNumDialogsInSetup_oid[]     = 
-		{ OPENSER_OID,3,1,3,1,3,2,3 };
+	static oid kamailioCurNumDialogsInSetup_oid[]     = 
+		{ KAMAILIO_OID,3,1,3,1,3,2,3 };
 
-	static oid openserTotalNumFailedDialogSetups_oid[] = 
-		{ OPENSER_OID,3,1,3,1,3,2,4 };
+	static oid kamailioTotalNumFailedDialogSetups_oid[] = 
+		{ KAMAILIO_OID,3,1,3,1,3,2,4 };
 
-	static oid openserDialogLimitMinorThreshold_oid[]  = 
-		{ OPENSER_OID,3,1,3,1,3,2,5 };
+	static oid kamailioDialogLimitMinorThreshold_oid[]  = 
+		{ KAMAILIO_OID,3,1,3,1,3,2,5 };
 
-	static oid openserDialogLimitMajorThreshold_oid[]  = 
-		{ OPENSER_OID,3,1,3,1,3,2,6 };
+	static oid kamailioDialogLimitMajorThreshold_oid[]  = 
+		{ KAMAILIO_OID,3,1,3,1,3,2,6 };
 
-	static oid openserTotalNumDialogSetups_oid[] =
-		{ OPENSER_OID,3,1,3,1,3,2,7 };
+	static oid kamailioTotalNumDialogSetups_oid[] =
+		{ KAMAILIO_OID,3,1,3,1,3,2,7 };
 
-	static oid openserDialogUsageState_oid[]       = 
-		{ OPENSER_OID,3,1,3,1,3,3,1 };
+	static oid kamailioDialogUsageState_oid[]       = 
+		{ KAMAILIO_OID,3,1,3,1,3,3,1 };
 
-	static oid openserDialogLimitAlarmStatus_oid[] = 
-		{ OPENSER_OID,3,1,3,1,3,4,1 };
+	static oid kamailioDialogLimitAlarmStatus_oid[] = 
+		{ KAMAILIO_OID,3,1,3,1,3,4,1 };
 
-	static oid openserDialogLimitMinorAlarm_oid[]  = 
-		{ OPENSER_OID,3,1,3,1,3,4,2 };
+	static oid kamailioDialogLimitMinorAlarm_oid[]  = 
+		{ KAMAILIO_OID,3,1,3,1,3,4,2 };
 
-	static oid openserDialogLimitMajorAlarm_oid[]  = 
-		{ OPENSER_OID,3,1,3,1,3,4,3 };
+	static oid kamailioDialogLimitMajorAlarm_oid[]  = 
+		{ KAMAILIO_OID,3,1,3,1,3,4,3 };
 
 
-  DEBUGMSGTL(("openserObjects", "Initializing\n"));
+  	DEBUGMSGTL(("kamailioObjects", "Initializing\n"));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserMsgQueueDepth", 
-			handle_openserMsgQueueDepth,
-			openserMsgQueueDepth_oid, 
-			OID_LENGTH(openserMsgQueueDepth_oid),
+			"kamailioMsgQueueDepth", 
+			handle_kamailioMsgQueueDepth,
+			kamailioMsgQueueDepth_oid, 
+			OID_LENGTH(kamailioMsgQueueDepth_oid),
 			HANDLER_CAN_RONLY)
 		);
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserMsgQueueMinorThreshold", 
-			handle_openserMsgQueueMinorThreshold,
-			openserMsgQueueMinorThreshold_oid, 
-			OID_LENGTH(openserMsgQueueMinorThreshold_oid),
+			"kamailioMsgQueueMinorThreshold", 
+			handle_kamailioMsgQueueMinorThreshold,
+			kamailioMsgQueueMinorThreshold_oid, 
+			OID_LENGTH(kamailioMsgQueueMinorThreshold_oid),
 			HANDLER_CAN_RONLY)
 		);
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserMsgQueueMajorThreshold", 
-			handle_openserMsgQueueMajorThreshold,
-			openserMsgQueueMajorThreshold_oid, 
-			OID_LENGTH(openserMsgQueueMajorThreshold_oid),
+			"kamailioMsgQueueMajorThreshold", 
+			handle_kamailioMsgQueueMajorThreshold,
+			kamailioMsgQueueMajorThreshold_oid, 
+			OID_LENGTH(kamailioMsgQueueMajorThreshold_oid),
 			HANDLER_CAN_RONLY)
 		);
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserMsgQueueDepthAlarmStatus", 
-			handle_openserMsgQueueDepthAlarmStatus,
-			openserMsgQueueDepthAlarmStatus_oid, 
-			OID_LENGTH(openserMsgQueueDepthAlarmStatus_oid),
+			"kamailioMsgQueueDepthAlarmStatus", 
+			handle_kamailioMsgQueueDepthAlarmStatus,
+			kamailioMsgQueueDepthAlarmStatus_oid, 
+			OID_LENGTH(kamailioMsgQueueDepthAlarmStatus_oid),
 			HANDLER_CAN_RONLY)
 		);
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserMsgQueueDepthMinorAlarm", 
-			handle_openserMsgQueueDepthMinorAlarm,
-			openserMsgQueueDepthMinorAlarm_oid, 
-			OID_LENGTH(openserMsgQueueDepthMinorAlarm_oid),
+			"kamailioMsgQueueDepthMinorAlarm", 
+			handle_kamailioMsgQueueDepthMinorAlarm,
+			kamailioMsgQueueDepthMinorAlarm_oid, 
+			OID_LENGTH(kamailioMsgQueueDepthMinorAlarm_oid),
 			HANDLER_CAN_RONLY)
 		);
   
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserMsgQueueDepthMajorAlarm", 
-			handle_openserMsgQueueDepthMajorAlarm,
-			openserMsgQueueDepthMajorAlarm_oid, 
-			OID_LENGTH(openserMsgQueueDepthMajorAlarm_oid),
+			"kamailioMsgQueueDepthMajorAlarm", 
+			handle_kamailioMsgQueueDepthMajorAlarm,
+			kamailioMsgQueueDepthMajorAlarm_oid, 
+			OID_LENGTH(kamailioMsgQueueDepthMajorAlarm_oid),
 			HANDLER_CAN_RONLY)
 		);
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserCurNumDialogs", 
-			handle_openserCurNumDialogs,
-			openserCurNumDialogs_oid, 
-			OID_LENGTH(openserCurNumDialogs_oid),
+			"kamailioCurNumDialogs", 
+			handle_kamailioCurNumDialogs,
+			kamailioCurNumDialogs_oid, 
+			OID_LENGTH(kamailioCurNumDialogs_oid),
 			HANDLER_CAN_RONLY)
 		);
 	
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserCurNumDialogsInProgress", 
-			handle_openserCurNumDialogsInProgress,
-			openserCurNumDialogsInProgress_oid, 
-			OID_LENGTH(openserCurNumDialogsInProgress_oid),
+			"kamailioCurNumDialogsInProgress", 
+			handle_kamailioCurNumDialogsInProgress,
+			kamailioCurNumDialogsInProgress_oid, 
+			OID_LENGTH(kamailioCurNumDialogsInProgress_oid),
 			HANDLER_CAN_RONLY)
 		);
 	
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserCurNumDialogsInSetup", 
-			handle_openserCurNumDialogsInSetup,
-			openserCurNumDialogsInSetup_oid, 
-			OID_LENGTH(openserCurNumDialogsInSetup_oid),
+			"kamailioCurNumDialogsInSetup", 
+			handle_kamailioCurNumDialogsInSetup,
+			kamailioCurNumDialogsInSetup_oid, 
+			OID_LENGTH(kamailioCurNumDialogsInSetup_oid),
 			HANDLER_CAN_RONLY)
 		);
   
   	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserTotalNumFailedDialogSetups", 
-		handle_openserTotalNumFailedDialogSetups,
-		openserTotalNumFailedDialogSetups_oid, 
-		OID_LENGTH(openserTotalNumFailedDialogSetups_oid),
+			"kamailioTotalNumFailedDialogSetups", 
+		handle_kamailioTotalNumFailedDialogSetups,
+		kamailioTotalNumFailedDialogSetups_oid, 
+		OID_LENGTH(kamailioTotalNumFailedDialogSetups_oid),
 		HANDLER_CAN_RONLY)
 		);
 	
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserDialogLimitMinorThreshold", 
-			handle_openserDialogLimitMinorThreshold,
-			openserDialogLimitMinorThreshold_oid, 
-			OID_LENGTH(openserDialogLimitMinorThreshold_oid),
+			"kamailioDialogLimitMinorThreshold", 
+			handle_kamailioDialogLimitMinorThreshold,
+			kamailioDialogLimitMinorThreshold_oid, 
+			OID_LENGTH(kamailioDialogLimitMinorThreshold_oid),
 			 HANDLER_CAN_RONLY)
 		);
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserDialogLimitMajorThreshold", 
-			handle_openserDialogLimitMajorThreshold,
-			openserDialogLimitMajorThreshold_oid, 
-			OID_LENGTH(openserDialogLimitMajorThreshold_oid),
+			"kamailioDialogLimitMajorThreshold", 
+			handle_kamailioDialogLimitMajorThreshold,
+			kamailioDialogLimitMajorThreshold_oid, 
+			OID_LENGTH(kamailioDialogLimitMajorThreshold_oid),
 			HANDLER_CAN_RONLY)
 		);
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserTotalNumDialogSetups",
-		handle_openserTotalNumDialogSetups,
-		openserTotalNumDialogSetups_oid,
-		OID_LENGTH(openserTotalNumDialogSetups_oid),
+			"kamailioTotalNumDialogSetups",
+		handle_kamailioTotalNumDialogSetups,
+		kamailioTotalNumDialogSetups_oid,
+		OID_LENGTH(kamailioTotalNumDialogSetups_oid),
 		HANDLER_CAN_RONLY)
 		);
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserDialogUsageState", 
-			handle_openserDialogUsageState,
-			openserDialogUsageState_oid, 
-			OID_LENGTH(openserDialogUsageState_oid),
+			"kamailioDialogUsageState", 
+			handle_kamailioDialogUsageState,
+			kamailioDialogUsageState_oid, 
+			OID_LENGTH(kamailioDialogUsageState_oid),
 			HANDLER_CAN_RONLY)
 		);
   
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserDialogLimitAlarmStatus", 
-			handle_openserDialogLimitAlarmStatus,
-			openserDialogLimitAlarmStatus_oid, 
-			OID_LENGTH(openserDialogLimitAlarmStatus_oid),
+			"kamailioDialogLimitAlarmStatus", 
+			handle_kamailioDialogLimitAlarmStatus,
+			kamailioDialogLimitAlarmStatus_oid, 
+			OID_LENGTH(kamailioDialogLimitAlarmStatus_oid),
 			HANDLER_CAN_RONLY)
 		);
    
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserDialogLimitMinorAlarm", 
-			handle_openserDialogLimitMinorAlarm,
-			openserDialogLimitMinorAlarm_oid, 
-			OID_LENGTH(openserDialogLimitMinorAlarm_oid),
+			"kamailioDialogLimitMinorAlarm", 
+			handle_kamailioDialogLimitMinorAlarm,
+			kamailioDialogLimitMinorAlarm_oid, 
+			OID_LENGTH(kamailioDialogLimitMinorAlarm_oid),
 			HANDLER_CAN_RONLY)
 		);
  
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserDialogLimitMajorAlarm", 
-			handle_openserDialogLimitMajorAlarm,
-			openserDialogLimitMajorAlarm_oid, 
-			OID_LENGTH(openserDialogLimitMajorAlarm_oid),
+			"kamailioDialogLimitMajorAlarm", 
+			handle_kamailioDialogLimitMajorAlarm,
+			kamailioDialogLimitMajorAlarm_oid, 
+			OID_LENGTH(kamailioDialogLimitMajorAlarm_oid),
 			HANDLER_CAN_RONLY)
 		);
 }
@@ -291,7 +291,7 @@ static int msgQueueMinorThreshold = -1;
 static int msgQueueMajorThreshold = -1;
 
 
-int handle_openserMsgQueueDepth(netsnmp_mib_handler *handler,
+int handle_kamailioMsgQueueDepth(netsnmp_mib_handler *handler,
   		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -309,7 +309,7 @@ int handle_openserMsgQueueDepth(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserMsgQueueMinorThreshold(netsnmp_mib_handler *handler,
+int handle_kamailioMsgQueueMinorThreshold(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -323,7 +323,7 @@ int handle_openserMsgQueueMinorThreshold(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserMsgQueueMajorThreshold(netsnmp_mib_handler *handler,
+int handle_kamailioMsgQueueMajorThreshold(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -337,7 +337,7 @@ int handle_openserMsgQueueMajorThreshold(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserMsgQueueDepthAlarmStatus(netsnmp_mib_handler *handler,
+int handle_kamailioMsgQueueDepthAlarmStatus(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -366,7 +366,7 @@ int handle_openserMsgQueueDepthAlarmStatus(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserMsgQueueDepthMinorAlarm(netsnmp_mib_handler *handler,
+int handle_kamailioMsgQueueDepthMinorAlarm(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -386,7 +386,7 @@ int handle_openserMsgQueueDepthMinorAlarm(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserMsgQueueDepthMajorAlarm(netsnmp_mib_handler *handler,
+int handle_kamailioMsgQueueDepthMajorAlarm(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -406,7 +406,7 @@ int handle_openserMsgQueueDepthMajorAlarm(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserCurNumDialogs(netsnmp_mib_handler *handler,
+int handle_kamailioCurNumDialogs(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -424,7 +424,7 @@ int handle_openserCurNumDialogs(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserCurNumDialogsInProgress(netsnmp_mib_handler *handler,
+int handle_kamailioCurNumDialogsInProgress(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -445,7 +445,7 @@ int handle_openserCurNumDialogsInProgress(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserCurNumDialogsInSetup(netsnmp_mib_handler *handler,
+int handle_kamailioCurNumDialogsInSetup(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -463,7 +463,7 @@ int handle_openserCurNumDialogsInSetup(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserTotalNumFailedDialogSetups(netsnmp_mib_handler *handler,
+int handle_kamailioTotalNumFailedDialogSetups(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -479,7 +479,7 @@ int handle_openserTotalNumFailedDialogSetups(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserTotalNumDialogSetups(netsnmp_mib_handler *handler,
+int handle_kamailioTotalNumDialogSetups(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -495,7 +495,7 @@ int handle_openserTotalNumDialogSetups(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserDialogLimitMinorThreshold(netsnmp_mib_handler *handler,
+int handle_kamailioDialogLimitMinorThreshold(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -509,7 +509,7 @@ int handle_openserDialogLimitMinorThreshold(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserDialogLimitMajorThreshold(netsnmp_mib_handler *handler,
+int handle_kamailioDialogLimitMajorThreshold(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -523,7 +523,7 @@ int handle_openserDialogLimitMajorThreshold(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserDialogUsageState(netsnmp_mib_handler *handler,
+int handle_kamailioDialogUsageState(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -556,7 +556,7 @@ int handle_openserDialogUsageState(netsnmp_mib_handler *handler,
 }
 
 
-int handle_openserDialogLimitAlarmStatus(netsnmp_mib_handler *handler,
+int handle_kamailioDialogLimitAlarmStatus(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -587,7 +587,7 @@ int handle_openserDialogLimitAlarmStatus(netsnmp_mib_handler *handler,
 
 
 
-int handle_openserDialogLimitMinorAlarm(netsnmp_mib_handler *handler,
+int handle_kamailioDialogLimitMinorAlarm(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -608,7 +608,7 @@ int handle_openserDialogLimitMinorAlarm(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserDialogLimitMajorAlarm(netsnmp_mib_handler *handler,
+int handle_kamailioDialogLimitMajorAlarm(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)

modules_k/snmpstats/snmpObjects.h

@@ -30,38 +30,38 @@
  *        : mib2c.scalar.conf,v 1.9 2005/01/07 09:37:18 dts12 Exp $
  *
  * This file defines all registration and handling of all scalars defined in the
- * OPENSER-MIB.  Please see OPENSER-MIB for the complete descriptions of the
+ * KAMAILIO-MIB.  Please see KAMAILIO-MIB for the complete descriptions of the
  * individual scalars.
  *
  */
 
-#ifndef OPENSEROBJECTS_H
-#define OPENSEROBJECTS_H
+#ifndef KAMAILIOOBJECTS_H
+#define KAMAILIOOBJECTS_H
 
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 
 /* function declarations */
-void init_openserObjects(void);
+void init_kamailioObjects(void);
 
-Netsnmp_Node_Handler handle_openserMsgQueueDepth;
-Netsnmp_Node_Handler handle_openserMsgQueueMinorThreshold;
-Netsnmp_Node_Handler handle_openserMsgQueueMajorThreshold;
-Netsnmp_Node_Handler handle_openserMsgQueueDepthAlarmStatus;
-Netsnmp_Node_Handler handle_openserMsgQueueDepthMinorAlarm;
-Netsnmp_Node_Handler handle_openserMsgQueueDepthMajorAlarm;
-Netsnmp_Node_Handler handle_openserCurNumDialogs;
-Netsnmp_Node_Handler handle_openserCurNumDialogsInProgress;
-Netsnmp_Node_Handler handle_openserCurNumDialogsInSetup;
-Netsnmp_Node_Handler handle_openserTotalNumFailedDialogSetups;
-Netsnmp_Node_Handler handle_openserDialogLimitMinorThreshold;
-Netsnmp_Node_Handler handle_openserDialogLimitMajorThreshold;
-Netsnmp_Node_Handler handle_openserTotalNumDialogSetups;
-Netsnmp_Node_Handler handle_openserDialogUsageState;
-Netsnmp_Node_Handler handle_openserDialogLimitAlarmStatus;
-Netsnmp_Node_Handler handle_openserDialogLimitMinorAlarm;
-Netsnmp_Node_Handler handle_openserDialogLimitMajorAlarm;
+Netsnmp_Node_Handler handle_kamailioMsgQueueDepth;
+Netsnmp_Node_Handler handle_kamailioMsgQueueMinorThreshold;
+Netsnmp_Node_Handler handle_kamailioMsgQueueMajorThreshold;
+Netsnmp_Node_Handler handle_kamailioMsgQueueDepthAlarmStatus;
+Netsnmp_Node_Handler handle_kamailioMsgQueueDepthMinorAlarm;
+Netsnmp_Node_Handler handle_kamailioMsgQueueDepthMajorAlarm;
+Netsnmp_Node_Handler handle_kamailioCurNumDialogs;
+Netsnmp_Node_Handler handle_kamailioCurNumDialogsInProgress;
+Netsnmp_Node_Handler handle_kamailioCurNumDialogsInSetup;
+Netsnmp_Node_Handler handle_kamailioTotalNumFailedDialogSetups;
+Netsnmp_Node_Handler handle_kamailioDialogLimitMinorThreshold;
+Netsnmp_Node_Handler handle_kamailioDialogLimitMajorThreshold;
+Netsnmp_Node_Handler handle_kamailioTotalNumDialogSetups;
+Netsnmp_Node_Handler handle_kamailioDialogUsageState;
+Netsnmp_Node_Handler handle_kamailioDialogLimitAlarmStatus;
+Netsnmp_Node_Handler handle_kamailioDialogLimitMinorAlarm;
+Netsnmp_Node_Handler handle_kamailioDialogLimitMajorAlarm;
 
 /* The following four functions are used to retrieve thresholds set via the
  * kamailio.cfg configuration file. */
@@ -70,4 +70,4 @@ int get_msg_queue_major_threshold(void);
 int get_dialog_minor_threshold(void);
 int get_dialog_major_threshold(void);
 
-#endif /* OPENSEROBJECTS_H */
+#endif /* KAMAILIOOBJECTS_H */

modules_k/snmpstats/snmpSIPCommonObjects.c

@@ -26,13 +26,13 @@
  * --------
  * 2006-11-23 initial version (jmagder)
  * 2007-02-16 Moved all OID registrations from the experimental branch to 
- *            OpenSER's IANA assigned enterprise branch. (jmagder)
+ *            Kamailio's IANA assigned enterprise branch. (jmagder)
  * 
  * Note: this file originally auto-generated by mib2c using
  *        : mib2c.scalar.conf,v 1.9 2005/01/07 09:37:18 dts12 Exp $
  *
  * This file defines all registration and handling of all scalars defined in the
- * OPENSER-SIP-COMMON-MIB.  Please see OPENSER-SIP-COMMON-MIB for the complete
+ * KAMAILIO-SIP-COMMON-MIB.  Please see KAMAILIO-SIP-COMMON-MIB for the complete
  * descriptions of the individual scalars.
  */
 
@@ -51,163 +51,163 @@
 #include "snmpstats_globals.h"
 #include "utilities.h"
 
-static char *openserVersion      = "SIP/2.0";
-static unsigned int openserEntityType = TC_SIP_ENTITY_ROLE_OTHER;
+static char *kamailioVersion      = "SIP/2.0";
+static unsigned int kamailioEntityType = TC_SIP_ENTITY_ROLE_OTHER;
 
 /* 
- * Initializes the openserSIPCommonObjects MIB elements.  This involves:
+ * Initializes the kamailioSIPCommonObjects MIB elements.  This involves:
  *
  *  - Registering all OID's
  *  - Setting up handlers for all OID's
  *
  * This function is mostly auto-generated.
  */
-void init_openserSIPCommonObjects(void)
+void init_kamailioSIPCommonObjects(void)
 {
-	static oid openserSIPProtocolVersion_oid[] =
-		{ OPENSER_OID,3,1,1,1,1,1 };
+	static oid kamailioSIPProtocolVersion_oid[] =
+		{ KAMAILIO_OID,3,1,1,1,1,1 };
 
-	static oid openserSIPServiceStartTime_oid[] =
-		{ OPENSER_OID,3,1,1,1,1,2 };
+	static oid kamailioSIPServiceStartTime_oid[] =
+		{ KAMAILIO_OID,3,1,1,1,1,2 };
 
-	static oid openserSIPEntityType_oid[] =
-		{ OPENSER_OID,3,1,1,1,1,4 };
+	static oid kamailioSIPEntityType_oid[] =
+		{ KAMAILIO_OID,3,1,1,1,1,4 };
 
-	static oid openserSIPSummaryInRequests_oid[] =
-		{ OPENSER_OID,3,1,1,1,3,1 };
+	static oid kamailioSIPSummaryInRequests_oid[] =
+		{ KAMAILIO_OID,3,1,1,1,3,1 };
 
-	static oid openserSIPSummaryOutRequests_oid[] =
-		{ OPENSER_OID,3,1,1,1,3,2 };
+	static oid kamailioSIPSummaryOutRequests_oid[] =
+		{ KAMAILIO_OID,3,1,1,1,3,2 };
 
-	static oid openserSIPSummaryInResponses_oid[] =
-		{ OPENSER_OID,3,1,1,1,3,3 };
+	static oid kamailioSIPSummaryInResponses_oid[] =
+		{ KAMAILIO_OID,3,1,1,1,3,3 };
 
-	static oid openserSIPSummaryOutResponses_oid[] =
-		{ OPENSER_OID,3,1,1,1,3,4 };
+	static oid kamailioSIPSummaryOutResponses_oid[] =
+		{ KAMAILIO_OID,3,1,1,1,3,4 };
 
-	static oid openserSIPSummaryTotalTransactions_oid[] =
-		{ OPENSER_OID,3,1,1,1,3,5 };
+	static oid kamailioSIPSummaryTotalTransactions_oid[] =
+		{ KAMAILIO_OID,3,1,1,1,3,5 };
 
-	static oid openserSIPCurrentTransactions_oid[] =
-		{ OPENSER_OID,3,1,1,1,6,1 };
+	static oid kamailioSIPCurrentTransactions_oid[] =
+		{ KAMAILIO_OID,3,1,1,1,6,1 };
 
-	static oid openserSIPNumUnsupportedUris_oid[] =
-		{ OPENSER_OID,3,1,1,1,8,1 };
+	static oid kamailioSIPNumUnsupportedUris_oid[] =
+		{ KAMAILIO_OID,3,1,1,1,8,1 };
 
-	static oid openserSIPNumUnsupportedMethods_oid[] =
-		{ OPENSER_OID,3,1,1,1,8,2 };
+	static oid kamailioSIPNumUnsupportedMethods_oid[] =
+		{ KAMAILIO_OID,3,1,1,1,8,2 };
 
-	static oid openserSIPOtherwiseDiscardedMsgs_oid[] = 
-		{ OPENSER_OID,3,1,1,1,8,3 };
+	static oid kamailioSIPOtherwiseDiscardedMsgs_oid[] = 
+		{ KAMAILIO_OID,3,1,1,1,8,3 };
 
-	DEBUGMSGTL(("openserSIPCommonObjects", "Initializing\n"));
+	DEBUGMSGTL(("kamailioSIPCommonObjects", "Initializing\n"));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPProtocolVersion",
-			handle_openserSIPProtocolVersion,
-			openserSIPProtocolVersion_oid,
-			OID_LENGTH(openserSIPProtocolVersion_oid),
+			"kamailioSIPProtocolVersion",
+			handle_kamailioSIPProtocolVersion,
+			kamailioSIPProtocolVersion_oid,
+			OID_LENGTH(kamailioSIPProtocolVersion_oid),
 			HANDLER_CAN_RONLY)); 
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPServiceStartTime",
-			handle_openserSIPServiceStartTime,
-			openserSIPServiceStartTime_oid,
-			OID_LENGTH(openserSIPServiceStartTime_oid),
+			"kamailioSIPServiceStartTime",
+			handle_kamailioSIPServiceStartTime,
+			kamailioSIPServiceStartTime_oid,
+			OID_LENGTH(kamailioSIPServiceStartTime_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPEntityType",
-			handle_openserSIPEntityType,
-			openserSIPEntityType_oid,
-			OID_LENGTH(openserSIPEntityType_oid),
+			"kamailioSIPEntityType",
+			handle_kamailioSIPEntityType,
+			kamailioSIPEntityType_oid,
+			OID_LENGTH(kamailioSIPEntityType_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPSummaryInRequests",
-			handle_openserSIPSummaryInRequests,
-			openserSIPSummaryInRequests_oid,
-			OID_LENGTH(openserSIPSummaryInRequests_oid),
+			"kamailioSIPSummaryInRequests",
+			handle_kamailioSIPSummaryInRequests,
+			kamailioSIPSummaryInRequests_oid,
+			OID_LENGTH(kamailioSIPSummaryInRequests_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPSummaryOutRequests",
-			handle_openserSIPSummaryOutRequests,
-			openserSIPSummaryOutRequests_oid,
-			OID_LENGTH(openserSIPSummaryOutRequests_oid),
+			"kamailioSIPSummaryOutRequests",
+			handle_kamailioSIPSummaryOutRequests,
+			kamailioSIPSummaryOutRequests_oid,
+			OID_LENGTH(kamailioSIPSummaryOutRequests_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPSummaryInResponses",
-			handle_openserSIPSummaryInResponses,
-			openserSIPSummaryInResponses_oid,
-			OID_LENGTH(openserSIPSummaryInResponses_oid),
+			"kamailioSIPSummaryInResponses",
+			handle_kamailioSIPSummaryInResponses,
+			kamailioSIPSummaryInResponses_oid,
+			OID_LENGTH(kamailioSIPSummaryInResponses_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPSummaryOutResponses",
-			handle_openserSIPSummaryOutResponses,
-			openserSIPSummaryOutResponses_oid,
-			OID_LENGTH(openserSIPSummaryOutResponses_oid),
+			"kamailioSIPSummaryOutResponses",
+			handle_kamailioSIPSummaryOutResponses,
+			kamailioSIPSummaryOutResponses_oid,
+			OID_LENGTH(kamailioSIPSummaryOutResponses_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPSummaryTotalTransactions",
-			handle_openserSIPSummaryTotalTransactions,
-			openserSIPSummaryTotalTransactions_oid,
-			OID_LENGTH(openserSIPSummaryTotalTransactions_oid),
+			"kamailioSIPSummaryTotalTransactions",
+			handle_kamailioSIPSummaryTotalTransactions,
+			kamailioSIPSummaryTotalTransactions_oid,
+			OID_LENGTH(kamailioSIPSummaryTotalTransactions_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPCurrentTransactions",
-			handle_openserSIPCurrentTransactions,
-			openserSIPCurrentTransactions_oid,
-			OID_LENGTH(openserSIPCurrentTransactions_oid),
+			"kamailioSIPCurrentTransactions",
+			handle_kamailioSIPCurrentTransactions,
+			kamailioSIPCurrentTransactions_oid,
+			OID_LENGTH(kamailioSIPCurrentTransactions_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPNumUnsupportedUris",
-			handle_openserSIPNumUnsupportedUris,
-			openserSIPNumUnsupportedUris_oid,
-			OID_LENGTH(openserSIPNumUnsupportedUris_oid),
+			"kamailioSIPNumUnsupportedUris",
+			handle_kamailioSIPNumUnsupportedUris,
+			kamailioSIPNumUnsupportedUris_oid,
+			OID_LENGTH(kamailioSIPNumUnsupportedUris_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPNumUnsupportedMethods",
-			handle_openserSIPNumUnsupportedMethods,
-			openserSIPNumUnsupportedMethods_oid,
-			OID_LENGTH(openserSIPNumUnsupportedMethods_oid),
+			"kamailioSIPNumUnsupportedMethods",
+			handle_kamailioSIPNumUnsupportedMethods,
+			kamailioSIPNumUnsupportedMethods_oid,
+			OID_LENGTH(kamailioSIPNumUnsupportedMethods_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPOtherwiseDiscardedMsgs",
-			handle_openserSIPOtherwiseDiscardedMsgs,
-			openserSIPOtherwiseDiscardedMsgs_oid,
-			OID_LENGTH(openserSIPOtherwiseDiscardedMsgs_oid),
+			"kamailioSIPOtherwiseDiscardedMsgs",
+			handle_kamailioSIPOtherwiseDiscardedMsgs,
+			kamailioSIPOtherwiseDiscardedMsgs_oid,
+			OID_LENGTH(kamailioSIPOtherwiseDiscardedMsgs_oid),
 			HANDLER_CAN_RONLY)); 
 
 }
 
-int handle_openserSIPProtocolVersion(netsnmp_mib_handler *handler,
+int handle_kamailioSIPProtocolVersion(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
 {    
 	if (reqinfo->mode==MODE_GET) {
 		snmp_set_var_typed_value(requests->requestvb, ASN_OCTET_STR,
-			(u_char *) openserVersion, 7);
+			(u_char *) kamailioVersion, 7);
 		return SNMP_ERR_NOERROR;
 	}
 
@@ -215,11 +215,11 @@ int handle_openserSIPProtocolVersion(netsnmp_mib_handler *handler,
 }
 
 /* 
- * The scalar represents what sysUpTime was when OpenSER first started.  This
+ * The scalar represents what sysUpTime was when Kamailio first started.  This
  * data was stored in a file when SNMPStats first started up, as a result of a
  * call to spawn_sysUpTime_child() 
  */
-int handle_openserSIPServiceStartTime(netsnmp_mib_handler *handler,
+int handle_kamailioSIPServiceStartTime(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -267,14 +267,14 @@ int handle_openserSIPServiceStartTime(netsnmp_mib_handler *handler,
 }
 
 
-int handle_openserSIPEntityType(netsnmp_mib_handler *handler,
+int handle_kamailioSIPEntityType(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
 {
 	if (reqinfo->mode==MODE_GET) {
 		snmp_set_var_typed_value(requests->requestvb, ASN_OCTET_STR,
-			(u_char *) &openserEntityType, 1);
+			(u_char *) &kamailioEntityType, 1);
 		return SNMP_ERR_NOERROR;
 	}
 
@@ -282,7 +282,7 @@ int handle_openserSIPEntityType(netsnmp_mib_handler *handler,
 }
 
 
-int handle_openserSIPSummaryInRequests(netsnmp_mib_handler *handler,
+int handle_kamailioSIPSummaryInRequests(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -298,7 +298,7 @@ int handle_openserSIPSummaryInRequests(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserSIPSummaryOutRequests(netsnmp_mib_handler *handler,
+int handle_kamailioSIPSummaryOutRequests(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -314,7 +314,7 @@ int handle_openserSIPSummaryOutRequests(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserSIPSummaryInResponses(netsnmp_mib_handler *handler,
+int handle_kamailioSIPSummaryInResponses(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -330,7 +330,7 @@ int handle_openserSIPSummaryInResponses(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserSIPSummaryOutResponses(netsnmp_mib_handler *handler,
+int handle_kamailioSIPSummaryOutResponses(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -360,7 +360,7 @@ int handle_openserSIPSummaryOutResponses(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserSIPSummaryTotalTransactions(netsnmp_mib_handler *handler,
+int handle_kamailioSIPSummaryTotalTransactions(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -382,7 +382,7 @@ int handle_openserSIPSummaryTotalTransactions(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserSIPCurrentTransactions(netsnmp_mib_handler *handler,
+int handle_kamailioSIPCurrentTransactions(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -398,7 +398,7 @@ int handle_openserSIPCurrentTransactions(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserSIPNumUnsupportedUris(netsnmp_mib_handler *handler,
+int handle_kamailioSIPNumUnsupportedUris(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -414,7 +414,7 @@ int handle_openserSIPNumUnsupportedUris(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserSIPNumUnsupportedMethods(netsnmp_mib_handler *handler,
+int handle_kamailioSIPNumUnsupportedMethods(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -430,7 +430,7 @@ int handle_openserSIPNumUnsupportedMethods(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserSIPOtherwiseDiscardedMsgs(netsnmp_mib_handler *handler,
+int handle_kamailioSIPOtherwiseDiscardedMsgs(netsnmp_mib_handler *handler,
 		netsnmp_handler_registration *reginfo,
 		netsnmp_agent_request_info   *reqinfo,
 		netsnmp_request_info         *requests)
@@ -457,7 +457,7 @@ int handle_openserSIPOtherwiseDiscardedMsgs(netsnmp_mib_handler *handler,
  */
 
 /* If type==STR_PARAM and stringParam is valid, this function will overwrite
- * openserEntityType with a bit value corresponding to the IETF's RFC  for 
+ * kamailioEntityType with a bit value corresponding to the IETF's RFC  for 
  * the SIP MIB.  (Textual Convention SipEntityRole).  Anything else is
  * considered an error.
  *
@@ -476,11 +476,11 @@ int handleSipEntityType( modparam_t type, void* val)
 	char *strEntityType = (char *)val;
 
 	/* This is our first time through this function, so we need to change
-	 * openserEntityType from its default to 0, allowing our bitmasks below
+	 * kamailioEntityType from its default to 0, allowing our bitmasks below
 	 * to work as expected. */
 	if (firstTime) {
 		firstTime = 0;
-		openserEntityType = 0;
+		kamailioEntityType = 0;
 	}	
 
 	/* Begin our string comparison.  This isn't the most efficient approach,
@@ -488,19 +488,19 @@ int handleSipEntityType( modparam_t type, void* val)
 	 * startup.  So our inefficiency is outweiged by simplicity 
 	 */
 	if (strcasecmp(strEntityType, "other") == 0) {
-		openserEntityType |= TC_SIP_ENTITY_ROLE_OTHER;
+		kamailioEntityType |= TC_SIP_ENTITY_ROLE_OTHER;
 	}
 	else if (strcasecmp(strEntityType, "userAgent") == 0) {
-		openserEntityType |= TC_SIP_ENTITY_ROLE_USER_AGENT; 
+		kamailioEntityType |= TC_SIP_ENTITY_ROLE_USER_AGENT; 
 	}
 	else if (strcasecmp(strEntityType, "proxyServer") == 0) {
-		openserEntityType |= TC_SIP_ENTITY_ROLE_PROXY_SERVER; 
+		kamailioEntityType |= TC_SIP_ENTITY_ROLE_PROXY_SERVER; 
 	}
 	else if (strcasecmp(strEntityType, "redirectServer") == 0) {
-		openserEntityType |= TC_SIP_ENTITY_ROLE_REDIRECT_SERVER;
+		kamailioEntityType |= TC_SIP_ENTITY_ROLE_REDIRECT_SERVER;
 	}
 	else if (strcasecmp(strEntityType, "registrarServer") == 0) {
-		openserEntityType |= TC_SIP_ENTITY_ROLE_REGISTRAR_SERVER;
+		kamailioEntityType |= TC_SIP_ENTITY_ROLE_REGISTRAR_SERVER;
 	}
 	else {
 		LM_ERR("The configuration file specified sipEntityType=%s,"

modules_k/snmpstats/snmpSIPCommonObjects.h

@@ -30,25 +30,25 @@
  *        : mib2c.scalar.conf,v 1.9 2005/01/07 09:37:18 dts12 Exp $
  *
  * This file defines all registration and handling of all scalars defined in the
- * OPENSER-SIP-COMMON-MIB.  Please see OPENSER-SIP-COMMON-MIB for the complete
+ * KAMAILIO-SIP-COMMON-MIB.  Please see KAMAILIO-SIP-COMMON-MIB for the complete
  * descriptions of the individual scalars.
  */
-#ifndef OPENSERSIPCOMMONOBJECTS_H
-#define OPENSERSIPCOMMONOBJECTS_H
+#ifndef KAMAILIOSIPCOMMONOBJECTS_H
+#define KAMAILIOSIPCOMMONOBJECTS_H
 
-void init_openserSIPCommonObjects(void);
+void init_kamailioSIPCommonObjects(void);
 
-Netsnmp_Node_Handler handle_openserSIPProtocolVersion;
-Netsnmp_Node_Handler handle_openserSIPServiceStartTime;
-Netsnmp_Node_Handler handle_openserSIPEntityType;
-Netsnmp_Node_Handler handle_openserSIPSummaryInRequests;
-Netsnmp_Node_Handler handle_openserSIPSummaryOutRequests;
-Netsnmp_Node_Handler handle_openserSIPSummaryInResponses;
-Netsnmp_Node_Handler handle_openserSIPSummaryOutResponses;
-Netsnmp_Node_Handler handle_openserSIPSummaryTotalTransactions;
-Netsnmp_Node_Handler handle_openserSIPCurrentTransactions;
-Netsnmp_Node_Handler handle_openserSIPNumUnsupportedUris;
-Netsnmp_Node_Handler handle_openserSIPNumUnsupportedMethods;
-Netsnmp_Node_Handler handle_openserSIPOtherwiseDiscardedMsgs;
+Netsnmp_Node_Handler handle_kamailioSIPProtocolVersion;
+Netsnmp_Node_Handler handle_kamailioSIPServiceStartTime;
+Netsnmp_Node_Handler handle_kamailioSIPEntityType;
+Netsnmp_Node_Handler handle_kamailioSIPSummaryInRequests;
+Netsnmp_Node_Handler handle_kamailioSIPSummaryOutRequests;
+Netsnmp_Node_Handler handle_kamailioSIPSummaryInResponses;
+Netsnmp_Node_Handler handle_kamailioSIPSummaryOutResponses;
+Netsnmp_Node_Handler handle_kamailioSIPSummaryTotalTransactions;
+Netsnmp_Node_Handler handle_kamailioSIPCurrentTransactions;
+Netsnmp_Node_Handler handle_kamailioSIPNumUnsupportedUris;
+Netsnmp_Node_Handler handle_kamailioSIPNumUnsupportedMethods;
+Netsnmp_Node_Handler handle_kamailioSIPOtherwiseDiscardedMsgs;
 
-#endif /* OPENSERSIPCOMMONOBJECTS_H */
+#endif /* KAMAILIOSIPCOMMONOBJECTS_H */

modules_k/snmpstats/snmpSIPContactTable.c

@@ -29,12 +29,12 @@
  * Note: this file originally auto-generated by mib2c using
  *        mib2c.array-user.conf 
  *
- * This file contains the implementation of the openserSIPContact Table.  For a
- * full description of this structure, please see the OPENSER-SIP-SERVER-MIB.
+ * This file contains the implementation of the kamailioSIPContact Table.  For a
+ * full description of this structure, please see the KAMAILIO-SIP-SERVER-MIB.
  *
  * Some important notes on implementation follow:
  *
- * We require OpenSERs usrloc module to inform us when a contact is
+ * We require Kamailios usrloc module to inform us when a contact is
  * added/removed.  The general callback process works as follows:
  *
  * 1) On startup, we register handleContactCallbacks() for USRLOC callbacks, so 
@@ -54,8 +54,8 @@
  *
  * - The interprocess buffer was necessary, because NetSNMP's containers can be
  *   very inefficient at adding large amounts of data at a time, such as when
- *   OpenSER first starts up.  It was decided its better to make an SNMP manager
- *   wait for data, instead of slowing down the rest of OpenSER while the
+ *   Kamailio first starts up.  It was decided its better to make an SNMP manager
+ *   wait for data, instead of slowing down the rest of Kamailio while the
  *   sub-agent processes the data. 
  *
  * - It is important to send periodic SNMP requests to this table (or the user
@@ -86,8 +86,8 @@
 static netsnmp_handler_registration *my_handler = NULL;
 static netsnmp_table_array_callbacks cb;
 
-oid openserSIPContactTable_oid[]      = { openserSIPContactTable_TABLE_OID };
-size_t openserSIPContactTable_oid_len = OID_LENGTH(openserSIPContactTable_oid);
+oid kamailioSIPContactTable_oid[]      = { kamailioSIPContactTable_TABLE_OID };
+size_t kamailioSIPContactTable_oid_len = OID_LENGTH(kamailioSIPContactTable_oid);
 
 /* 
  * This function adds a new contactToIndexStruct_t record to the front of
@@ -170,15 +170,15 @@ int deleteContactRecord(contactToIndexStruct_t **contactRecord,char *contactName
 int createContactRow(int userIndex, int contactIndex, char *contactName, 
 		ucontact_t *contactInfo)  
 {
-	openserSIPContactTable_context *theRow;
+	kamailioSIPContactTable_context *theRow;
 
 	oid  *OIDIndex;
 	int  stringLength;
 
-	theRow = SNMP_MALLOC_TYPEDEF(openserSIPContactTable_context);
+	theRow = SNMP_MALLOC_TYPEDEF(kamailioSIPContactTable_context);
 
 	if (theRow == NULL) {
-		LM_ERR("failed to create a row for openserSIPContactTable\n");
+		LM_ERR("failed to create a row for kamailioSIPContactTable\n");
 		return 0;
 	}
 
@@ -187,7 +187,7 @@ int createContactRow(int userIndex, int contactIndex, char *contactName,
 
 	if (OIDIndex == NULL) {
 		free(theRow);
-		LM_ERR("failed to create a row for openserSIPContactTable\n");
+		LM_ERR("failed to create a row for kamailioSIPContactTable\n");
 		return 0;
 	}
 
@@ -199,22 +199,22 @@ int createContactRow(int userIndex, int contactIndex, char *contactName,
 
 	theRow->index.len  = 2;
 	theRow->index.oids = OIDIndex;
-	theRow->openserSIPContactIndex = contactIndex;
+	theRow->kamailioSIPContactIndex = contactIndex;
 
 	/* Fill in the rest of the rows columns */
-	theRow->openserSIPContactURI = (unsigned char*)
+	theRow->kamailioSIPContactURI = (unsigned char*)
         pkg_malloc((stringLength+ 1)* sizeof(char));
-    if(theRow->openserSIPContactURI == NULL)
+    if(theRow->kamailioSIPContactURI == NULL)
     {
         pkg_free(OIDIndex);
 		free(theRow);
 		LM_ERR("failed to allocate memory for contact name\n");
 		return 0;
     }
-    memcpy(theRow->openserSIPContactURI, contactName, stringLength);
-    theRow->openserSIPContactURI[stringLength] = '\0';
+    memcpy(theRow->kamailioSIPContactURI, contactName, stringLength);
+    theRow->kamailioSIPContactURI[stringLength] = '\0';
 
-    theRow->openserSIPContactURI_len = stringLength;
+    theRow->kamailioSIPContactURI_len = stringLength;
 	theRow->contactInfo = contactInfo;
 
 	CONTAINER_INSERT(cb.container, theRow);
@@ -229,7 +229,7 @@ int createContactRow(int userIndex, int contactIndex, char *contactName,
  */
 void deleteContactRow(int userIndex, int contactIndex) 
 {
-	openserSIPContactTable_context *theRow;
+	kamailioSIPContactTable_context *theRow;
 
 	netsnmp_index indexToRemove;
 	oid indexToRemoveOID[2];
@@ -247,23 +247,23 @@ void deleteContactRow(int userIndex, int contactIndex)
 	 * malloc() */
 	if (theRow != NULL) {
 		CONTAINER_REMOVE(cb.container, &indexToRemove);
-		pkg_free(theRow->openserSIPContactURI);
+		pkg_free(theRow->kamailioSIPContactURI);
 		pkg_free(theRow->index.oids);
 		free(theRow);
 	} 
 }
 
 /*
- * Initializes the openserSIPContactTable module.  This involves:
+ * Initializes the kamailioSIPContactTable module.  This involves:
  *
  *  1) Registering the tables OID with the master agent
  *
  *  2) Creating a default row, so that there is a row to query to trigger the
  *     consumption of the interprocess buffer.
  */
-void init_openserSIPContactTable(void)
+void init_kamailioSIPContactTable(void)
 {
-	initialize_table_openserSIPContactTable();
+	initialize_table_kamailioSIPContactTable();
 
 	static char *defaultUser = "DefaultUser";
 
@@ -273,17 +273,17 @@ void init_openserSIPContactTable(void)
 
 
 /*
- * Initialize the openserSIPContactTable table by defining its contents and how
+ * Initialize the kamailioSIPContactTable table by defining its contents and how
  * it's structured.
  *
  * This function is mostly auto-generated.
  */
-void initialize_table_openserSIPContactTable(void)
+void initialize_table_kamailioSIPContactTable(void)
 {
 	netsnmp_table_registration_info *table_info;
 
 	if(my_handler) {
-		snmp_log(LOG_ERR, "initialize_table_openserSIPContactTable_"
+		snmp_log(LOG_ERR, "initialize_table_kamailioSIPContactTable_"
 				"handler called again\n");
 		return;
 	}
@@ -294,35 +294,35 @@ void initialize_table_openserSIPContactTable(void)
 	table_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_registration_info);
 
 	my_handler = netsnmp_create_handler_registration(
-			"openserSIPContactTable",
+			"kamailioSIPContactTable",
 			netsnmp_table_array_helper_handler,
-			openserSIPContactTable_oid,
-			openserSIPContactTable_oid_len,
+			kamailioSIPContactTable_oid,
+			kamailioSIPContactTable_oid_len,
 			HANDLER_CAN_RONLY);
 			
 	if (!my_handler || !table_info) {
-		snmp_log(LOG_ERR, "malloc failed in initialize_table_openser"
+		snmp_log(LOG_ERR, "malloc failed in initialize_table_kamailio"
 				"SIPContactTable_handler\n");
 		return; /** mallocs failed */
 	}
 
-	/** index: openserSIPUserIndex */
+	/** index: kamailioSIPUserIndex */
 	netsnmp_table_helper_add_index(table_info, ASN_UNSIGNED);
-	/** index: openserSIPContactIndex */
+	/** index: kamailioSIPContactIndex */
 	netsnmp_table_helper_add_index(table_info, ASN_UNSIGNED);
 
-	table_info->min_column = openserSIPContactTable_COL_MIN;
-	table_info->max_column = openserSIPContactTable_COL_MAX;
+	table_info->min_column = kamailioSIPContactTable_COL_MIN;
+	table_info->max_column = kamailioSIPContactTable_COL_MAX;
 
 	/***************************************************
 	 * registering the table with the master agent
 	 */
-	cb.get_value = openserSIPContactTable_get_value;
-	cb.container = netsnmp_container_find("openserSIPContactTable_primary:"
-			"openserSIPContactTable:" "table_container");
+	cb.get_value = kamailioSIPContactTable_get_value;
+	cb.container = netsnmp_container_find("kamailioSIPContactTable_primary:"
+			"kamailioSIPContactTable:" "table_container");
 	
-	DEBUGMSGTL(("initialize_table_openserSIPContactTable",
-				"Registering table openserSIPContactTable "
+	DEBUGMSGTL(("initialize_table_kamailioSIPContactTable",
+				"Registering table kamailioSIPContactTable "
 				"as a table array\n"));
 	
 	netsnmp_table_container_register(my_handler, table_info, &cb, 
@@ -335,11 +335,11 @@ void initialize_table_openserSIPContactTable(void)
  *
  * The function differs from its original auto-generated form in that the row
  * itself doesn't store all the data that is needed.  Some of the values
- * (openserSIPContactURI, openserSIPContactExpiry, openserSIPContactPreference)
+ * (kamailioSIPContactURI, kamailioSIPContactExpiry, kamailioSIPContactPreference)
  * may have changed since the row was first created.  Therefore, this data is
  * retrieved when it is requested for.
  */
-int openserSIPContactTable_get_value(
+int kamailioSIPContactTable_get_value(
 			netsnmp_request_info *request,
 			netsnmp_index *item,
 			netsnmp_table_request_info *table_info )
@@ -360,31 +360,31 @@ int openserSIPContactTable_get_value(
 
 	netsnmp_variable_list *var = request->requestvb;
 
-	openserSIPContactTable_context *context = 
-		(openserSIPContactTable_context *)item;
+	kamailioSIPContactTable_context *context = 
+		(kamailioSIPContactTable_context *)item;
 
 	switch(table_info->colnum) 
 	{
 
-		case COLUMN_OPENSERSIPCONTACTDISPLAYNAME:
+		case COLUMN_KAMAILIOSIPCONTACTDISPLAYNAME:
 
 			/* FIXME: WHERE DO WE FIND THIS??  Setting to the same
 			 * thing as contact uri for now. */
 			snmp_set_var_typed_value(var, ASN_OCTET_STR, 
 					(unsigned char*)
-					context->openserSIPContactURI,
-					context->openserSIPContactURI_len);
+					context->kamailioSIPContactURI,
+					context->kamailioSIPContactURI_len);
 			break;
 
-		case COLUMN_OPENSERSIPCONTACTURI:
+		case COLUMN_KAMAILIOSIPCONTACTURI:
 
 			snmp_set_var_typed_value(var, ASN_OCTET_STR,
 					 (unsigned char*)
-					 context->openserSIPContactURI,
-					 context->openserSIPContactURI_len);
+					 context->kamailioSIPContactURI,
+					 context->kamailioSIPContactURI_len);
 			break;
 	
-		case COLUMN_OPENSERSIPCONTACTLASTUPDATED:
+		case COLUMN_KAMAILIOSIPCONTACTLASTUPDATED:
 		
 			if (context->contactInfo != NULL) 
 			{
@@ -402,7 +402,7 @@ int openserSIPContactTable_get_value(
 					 8);
 			break;
 	
-		case COLUMN_OPENSERSIPCONTACTEXPIRY:
+		case COLUMN_KAMAILIOSIPCONTACTEXPIRY:
 
 			if (context->contactInfo != NULL) 
 			{
@@ -420,13 +420,13 @@ int openserSIPContactTable_get_value(
 					 8);
 			break;
 	
-		case COLUMN_OPENSERSIPCONTACTPREFERENCE:
+		case COLUMN_KAMAILIOSIPCONTACTPREFERENCE:
 
 			if (context->contactInfo != NULL) {
 				preferenceAsFloat = context->contactInfo->q;
 			}
 
-			/* OpenSER stores the q-value as an integer for speed
+			/* Kamailio stores the q-value as an integer for speed
 			 * purposes.  We need to convert this value to a float
 			 * to conform to the MIB and RFC specifications of the q
 			 * value. */
@@ -444,7 +444,7 @@ int openserSIPContactTable_get_value(
 	
 		default: /** We shouldn't get here */
 			snmp_log(LOG_ERR, "unknown column in "
-					 "openserSIPContactTable_get_value\n");
+					 "kamailioSIPContactTable_get_value\n");
 			return SNMP_ERR_GENERR;
 	}
 
@@ -452,12 +452,12 @@ int openserSIPContactTable_get_value(
 }
 
 /* 
- * openserSIPContactTable_get_by_idx is an auto-generated function. 
+ * kamailioSIPContactTable_get_by_idx is an auto-generated function. 
  */
-const openserSIPContactTable_context *
-openserSIPContactTable_get_by_idx(netsnmp_index * hdr)
+const kamailioSIPContactTable_context *
+kamailioSIPContactTable_get_by_idx(netsnmp_index * hdr)
 {
-	return (const openserSIPContactTable_context *)
+	return (const kamailioSIPContactTable_context *)
 		CONTAINER_FIND(cb.container, hdr );
 }
 

modules_k/snmpstats/snmpSIPContactTable.h

@@ -26,17 +26,17 @@
  * --------
  * 2006-11-23 initial version (jmagder)
  * 2007-02-16 Moved all OID registrations from the experimental branch to 
- *            OpenSER's IANA assigned enterprise branch. (jmagder)
+ *            Kamailio's IANA assigned enterprise branch. (jmagder)
  * 
  * Note: this file was originally auto-generated by mib2c using
  * mib2c.array-user.conf
  *
- * This file contains the implementation of the openserSIPContact Table.  For a
- * full description of this structure, please see the OPENSER-SIP-SERVER-MIB.
+ * This file contains the implementation of the kamailioSIPContact Table.  For a
+ * full description of this structure, please see the KAMAILIO-SIP-SERVER-MIB.
  *
  * Some important notes on implementation follow:
  *
- * We require OpenSERs usrloc module to inform us when a contact is
+ * We require Kamailios usrloc module to inform us when a contact is
  * added/removed.  The general callback process works as follows:
  *
  * 1) On startup, we register handleContactCallbacks() for USRLOC callbacks, so 
@@ -56,16 +56,16 @@
  *
  * - The interprocess buffer was necessary, because NetSNMP's containers can be
  *   very inefficient at adding large amounts of data at a time, such as when
- *   OpenSER first starts up.  It was decided its better to make an SNMP manager
- *   wait for data, instead of slowing down the rest of OpenSER while the
+ *   Kamailio first starts up.  It was decided its better to make an SNMP manager
+ *   wait for data, instead of slowing down the rest of Kamailio while the
  *   sub-agent processes the data. 
  *
  * - It is important to send periodic SNMP requests to this table (or the user
  *   table), to make sure the process buffer doesn't get too large.  
  */
 
-#ifndef OPENSERSIPCONTACTTABLE_H
-#define OPENSERSIPCONTACTTABLE_H
+#ifndef KAMAILIOSIPCONTACTTABLE_H
+#define KAMAILIOSIPCONTACTTABLE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -82,28 +82,28 @@ extern "C" {
 #include "../../config.h"
 
 /* This strucutre is actually quite different from what was generated by mib2c.
- * Specifically, the scalars openserSIPContactURI, openserSIPContactExpiry, and
- * openserSIPContactPreference have been removed from the rows definition.  This
+ * Specifically, the scalars kamailioSIPContactURI, kamailioSIPContactExpiry, and
+ * kamailioSIPContactPreference have been removed from the rows definition.  This
  * was done because the values change over time.  Therefore we retrieve the data
  * only when it is requested for, instead of storing stale data.
  */
-typedef struct openserSIPContactTable_context_s 
+typedef struct kamailioSIPContactTable_context_s 
 {
 	netsnmp_index index; /** THIS MUST BE FIRST!!! */
 
-	unsigned long openserSIPContactIndex;
+	unsigned long kamailioSIPContactIndex;
 
-	unsigned char *openserSIPContactURI;
-	long           openserSIPContactURI_len;
+	unsigned char *kamailioSIPContactURI;
+	long           kamailioSIPContactURI_len;
 
 	/* A pointer to the rest of the contact structure, giving us access to
-	 * openserSIPContactURI, openserSIPContactExpirty, and
-	 * openserSIPContactPreference. */
+	 * kamailioSIPContactURI, kamailioSIPContactExpirty, and
+	 * kamailioSIPContactPreference. */
 	ucontact_t *contactInfo;
 
 	void * data;
 
-} openserSIPContactTable_context;
+} kamailioSIPContactTable_context;
 
 /******************************/
 /* Customized SNMP Prototypes */
@@ -151,56 +151,56 @@ int  deleteContactRecord(contactToIndexStruct_t **contactRecord,
 /********************************/
 
 /*
- * Initializes the openserSIPContactTable module.  This involves:
+ * Initializes the kamailioSIPContactTable module.  This involves:
  *
  *  1) Registering the tables OID with the master agent
  *
  *  2) Creating a default row, so that there is a row to query to trigger the
  *     consumption of the interprocess buffer.
  */
-void  init_openserSIPContactTable(void);
+void  init_kamailioSIPContactTable(void);
 
 
 /*
- * Initialize the openserSIPContactTable table by defining its contents and how
+ * Initialize the kamailioSIPContactTable table by defining its contents and how
  * it's structured.
  *
  * This function is mostly auto-generated.
  */
-void  initialize_table_openserSIPContactTable(void);
+void  initialize_table_kamailioSIPContactTable(void);
 
-const openserSIPContactTable_context * openserSIPContactTable_get_by_idx(
+const kamailioSIPContactTable_context * kamailioSIPContactTable_get_by_idx(
 		netsnmp_index *);
 
-const openserSIPContactTable_context * openserSIPContactTable_get_by_idx_rs(
+const kamailioSIPContactTable_context * kamailioSIPContactTable_get_by_idx_rs(
 		netsnmp_index *, int row_status);
 
 /* This routine is called to process get requests for elements of the table. */
-int   openserSIPContactTable_get_value(netsnmp_request_info *, netsnmp_index *,
+int   kamailioSIPContactTable_get_value(netsnmp_request_info *, netsnmp_index *,
 		netsnmp_table_request_info *);
 
 
 /* oid declarations */
-extern oid    openserSIPContactTable_oid[];
-extern size_t openserSIPContactTable_oid_len;
+extern oid    kamailioSIPContactTable_oid[];
+extern size_t kamailioSIPContactTable_oid_len;
 
-#define openserSIPContactTable_TABLE_OID OPENSER_OID,3,1,2,1,5,7
+#define kamailioSIPContactTable_TABLE_OID KAMAILIO_OID,3,1,2,1,5,7
     
 /*************************************************************
- * column number definitions for table openserSIPContactTable
+ * column number definitions for table kamailioSIPContactTable
  */
-#define COLUMN_OPENSERSIPCONTACTINDEX       1
-#define COLUMN_OPENSERSIPCONTACTDISPLAYNAME 2
-#define COLUMN_OPENSERSIPCONTACTURI         3
-#define COLUMN_OPENSERSIPCONTACTLASTUPDATED 4
-#define COLUMN_OPENSERSIPCONTACTEXPIRY      5
-#define COLUMN_OPENSERSIPCONTACTPREFERENCE  6
+#define COLUMN_KAMAILIOSIPCONTACTINDEX       1
+#define COLUMN_KAMAILIOSIPCONTACTDISPLAYNAME 2
+#define COLUMN_KAMAILIOSIPCONTACTURI         3
+#define COLUMN_KAMAILIOSIPCONTACTLASTUPDATED 4
+#define COLUMN_KAMAILIOSIPCONTACTEXPIRY      5
+#define COLUMN_KAMAILIOSIPCONTACTPREFERENCE  6
 
-#define openserSIPContactTable_COL_MIN 2
-#define openserSIPContactTable_COL_MAX 6
+#define kamailioSIPContactTable_COL_MIN 2
+#define kamailioSIPContactTable_COL_MAX 6
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /** OPENSERSIPCONTACTTABLE_H */
+#endif /** KAMAILIOSIPCONTACTTABLE_H */

modules_k/snmpstats/snmpSIPMethodSupportedTable.c

@@ -28,13 +28,13 @@
  * 
  * Originally Generated with mib2c using mib2c.array-user.conf
  *
- * The file implements the openserSIPMethodSupportedTable.  The table is
+ * The file implements the kamailioSIPMethodSupportedTable.  The table is
  * populated by looking to see which modules are loaded, and guessing what SIP
  * Methods they  provide.  It is quite possible that this initial implementation
  * is not very good at guessing.  This should be fixed in future releases as
  * more information becomes available.  
  *
- * For full details, please see the OPENSER-SIP-COMMON-MIB.
+ * For full details, please see the KAMAILIO-SIP-COMMON-MIB.
  *
  */
 
@@ -53,11 +53,11 @@
 static netsnmp_handler_registration *my_handler = NULL;
 static netsnmp_table_array_callbacks cb;
 
-oid    openserSIPMethodSupportedTable_oid[] = 
-	{ openserSIPMethodSupportedTable_TABLE_OID };
+oid    kamailioSIPMethodSupportedTable_oid[] = 
+	{ kamailioSIPMethodSupportedTable_TABLE_OID };
 
-size_t openserSIPMethodSupportedTable_oid_len = 
-	OID_LENGTH(openserSIPMethodSupportedTable_oid);
+size_t kamailioSIPMethodSupportedTable_oid_len = 
+	OID_LENGTH(kamailioSIPMethodSupportedTable_oid);
 
 
 /* Create a row at the given index, containing stringToRegister, and insert it
@@ -65,16 +65,16 @@ size_t openserSIPMethodSupportedTable_oid_len =
  * necessary to pre-allocate this string anywhere. */
 void createRow(int index, char *stringToRegister) {
 
-	openserSIPMethodSupportedTable_context *theRow;
+	kamailioSIPMethodSupportedTable_context *theRow;
 
 	oid  *OIDIndex;
 	char *copiedString;
 	int  stringLength;
 
-	theRow = SNMP_MALLOC_TYPEDEF(openserSIPMethodSupportedTable_context);
+	theRow = SNMP_MALLOC_TYPEDEF(kamailioSIPMethodSupportedTable_context);
 
 	if (theRow == NULL) {
-		LM_ERR("failed to create a row for openserSIPMethodSupportedTable\n");
+		LM_ERR("failed to create a row for kamailioSIPMethodSupportedTable\n");
 		return;
 	}
 
@@ -82,7 +82,7 @@ void createRow(int index, char *stringToRegister) {
 
 	if (OIDIndex == NULL) {
 		free(theRow);
-		LM_ERR("failed to create a row for openserSIPMethodSupportedTable\n");
+		LM_ERR("failed to create a row for kamailioSIPMethodSupportedTable\n");
 		return;
 	}
 
@@ -91,7 +91,7 @@ void createRow(int index, char *stringToRegister) {
 	copiedString = pkg_malloc((stringLength + 1) * sizeof(char));
 
 	if (copiedString == NULL) {
-		LM_ERR("failed to create a row for openserSIPMethodSupportedTable\n");
+		LM_ERR("failed to create a row for kamailioSIPMethodSupportedTable\n");
 		return;
 	}
 
@@ -101,20 +101,20 @@ void createRow(int index, char *stringToRegister) {
 
 	theRow->index.len  = 1;
 	theRow->index.oids = OIDIndex;
-	theRow->openserSIPMethodSupportedIndex = index;
+	theRow->kamailioSIPMethodSupportedIndex = index;
 
-	theRow->openserSIPMethodName     = (unsigned char*) copiedString;
-	theRow->openserSIPMethodName_len = stringLength;
+	theRow->kamailioSIPMethodName     = (unsigned char*) copiedString;
+	theRow->kamailioSIPMethodName_len = stringLength;
 
 	CONTAINER_INSERT(cb.container, theRow);
 }
 
 
-/* Initializes the openserSIPMethodSupportedTable, and populates the tables 
+/* Initializes the kamailioSIPMethodSupportedTable, and populates the tables 
  * contents */
-void init_openserSIPMethodSupportedTable(void)
+void init_kamailioSIPMethodSupportedTable(void)
 {
-	initialize_table_openserSIPMethodSupportedTable();
+	initialize_table_kamailioSIPMethodSupportedTable();
 
 	/* Tables is defined as follows:
 	 *
@@ -175,14 +175,14 @@ void init_openserSIPMethodSupportedTable(void)
 }
 
 
-/* Initialize the openserSIPMethodSupportedTable by defining its structure and
+/* Initialize the kamailioSIPMethodSupportedTable by defining its structure and
  * callback mechanisms */
-void initialize_table_openserSIPMethodSupportedTable(void)
+void initialize_table_kamailioSIPMethodSupportedTable(void)
 {
 	netsnmp_table_registration_info *table_info;
 
 	if(my_handler) {
-		snmp_log(LOG_ERR, "initialize_table_openserSIPMethodSupported"
+		snmp_log(LOG_ERR, "initialize_table_kamailioSIPMethodSupported"
 				"Table_handler called again\n");
 		return;
 	}
@@ -194,33 +194,33 @@ void initialize_table_openserSIPMethodSupportedTable(void)
 
 	my_handler = 
 		netsnmp_create_handler_registration(
-			"openserSIPMethodSupportedTable",
+			"kamailioSIPMethodSupportedTable",
 			netsnmp_table_array_helper_handler,
-			openserSIPMethodSupportedTable_oid,
-			openserSIPMethodSupportedTable_oid_len,
+			kamailioSIPMethodSupportedTable_oid,
+			kamailioSIPMethodSupportedTable_oid_len,
 			HANDLER_CAN_RONLY);
 			
 	if (!my_handler || !table_info) {
-		snmp_log(LOG_ERR, "malloc failed in initialize_table_openser"
+		snmp_log(LOG_ERR, "malloc failed in initialize_table_kamailio"
 				"SIPMethodSupportedTable_handler\n");
 		return; 
 	}
 
 	netsnmp_table_helper_add_index(table_info, ASN_UNSIGNED);
 
-	table_info->min_column = openserSIPMethodSupportedTable_COL_MIN;
-	table_info->max_column = openserSIPMethodSupportedTable_COL_MAX;
+	table_info->min_column = kamailioSIPMethodSupportedTable_COL_MIN;
+	table_info->max_column = kamailioSIPMethodSupportedTable_COL_MAX;
 
 	/***************************************************
 	 * registering the table with the master agent
 	 */
-	cb.get_value = openserSIPMethodSupportedTable_get_value;
+	cb.get_value = kamailioSIPMethodSupportedTable_get_value;
 	cb.container = 
-		netsnmp_container_find("openserSIPMethodSupportedTable_primary:"
-			"openserSIPMethodSupportedTable:" "table_container");
+		netsnmp_container_find("kamailioSIPMethodSupportedTable_primary:"
+			"kamailioSIPMethodSupportedTable:" "table_container");
 	
-	DEBUGMSGTL(("initialize_table_openserSIPMethodSupportedTable", 
-				"Registering table openserSIPMethodSupportedTable"
+	DEBUGMSGTL(("initialize_table_kamailioSIPMethodSupportedTable", 
+				"Registering table kamailioSIPMethodSupportedTable"
 				"as a table array\n"));
 
 	netsnmp_table_container_register(my_handler, table_info, &cb,
@@ -233,29 +233,29 @@ void initialize_table_openserSIPMethodSupportedTable(void)
  *
  * The function is pretty much left as is from the auto-generated code. 
  */
-int openserSIPMethodSupportedTable_get_value(
+int kamailioSIPMethodSupportedTable_get_value(
 			netsnmp_request_info *request,
 			netsnmp_index *item,
 			netsnmp_table_request_info *table_info )
 {
 	netsnmp_variable_list *var = request->requestvb;
 
-	openserSIPMethodSupportedTable_context *context = 
-		(openserSIPMethodSupportedTable_context *)item;
+	kamailioSIPMethodSupportedTable_context *context = 
+		(kamailioSIPMethodSupportedTable_context *)item;
 
 	switch(table_info->colnum) 
 	{
-		case COLUMN_OPENSERSIPMETHODNAME:
+		case COLUMN_KAMAILIOSIPMETHODNAME:
 
 			/** SnmpAdminString = ASN_OCTET_STR */
 			snmp_set_var_typed_value(var, ASN_OCTET_STR,
 					(unsigned char*)
-					context->openserSIPMethodName,
-					context->openserSIPMethodName_len );
+					context->kamailioSIPMethodName,
+					context->kamailioSIPMethodName_len );
 			break;
 	
 		default: /** We shouldn't get here */
-			snmp_log(LOG_ERR, "unknown column in openserSIPMethod"
+			snmp_log(LOG_ERR, "unknown column in kamailioSIPMethod"
 					"SupportedTable_get_value\n");
 			return SNMP_ERR_GENERR;
 	}
@@ -264,12 +264,12 @@ int openserSIPMethodSupportedTable_get_value(
 }
 
 /*
- * openserSIPMethodSupportedTable_get_by_idx is an auto-generated function.
+ * kamailioSIPMethodSupportedTable_get_by_idx is an auto-generated function.
  */
-const openserSIPMethodSupportedTable_context *
-	openserSIPMethodSupportedTable_get_by_idx(netsnmp_index * hdr)
+const kamailioSIPMethodSupportedTable_context *
+	kamailioSIPMethodSupportedTable_get_by_idx(netsnmp_index * hdr)
 {
-	return (const openserSIPMethodSupportedTable_context *)
+	return (const kamailioSIPMethodSupportedTable_context *)
 		CONTAINER_FIND(cb.container, hdr );
 }
 

modules_k/snmpstats/snmpSIPMethodSupportedTable.h

@@ -26,17 +26,17 @@
  * --------
  * 2006-11-23 initial version (jmagder)
  * 2007-02-16 Moved all OID registrations from the experimental branch to 
- *            OpenSER's IANA assigned enterprise branch. (jmagder)
+ *            Kamailio's IANA assigned enterprise branch. (jmagder)
  * 
  * Originally Generated with Mib2c using mib2c.array-user.conf.
  * 
  * This file defines the prototypes used to define the
- * openserSIPMethodSupportedTable.  For full details, please see the
- * OPENSER-SIP-COMMON-MIB.
+ * kamailioSIPMethodSupportedTable.  For full details, please see the
+ * KAMAILIO-SIP-COMMON-MIB.
  */
 
-#ifndef OPENSERSIPMETHODSUPPORTEDTABLE_H
-#define OPENSERSIPMETHODSUPPORTEDTABLE_H
+#ifndef KAMAILIOSIPMETHODSUPPORTEDTABLE_H
+#define KAMAILIOSIPMETHODSUPPORTEDTABLE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,29 +53,29 @@ extern "C" {
  * This strucutre represents a single row in the SNMP table, and is mostly
  * auto-generated. 
  */
-typedef struct openserSIPMethodSupportedTable_context_s {
+typedef struct kamailioSIPMethodSupportedTable_context_s {
 
 	netsnmp_index index;
 
-	/** OpenSERSIPMethodIdentifier = ASN_UNSIGNED */
-	unsigned long openserSIPMethodSupportedIndex;
+	/** KamailioSIPMethodIdentifier = ASN_UNSIGNED */
+	unsigned long kamailioSIPMethodSupportedIndex;
 
 	/** SnmpAdminString = ASN_OCTET_STR */
-	unsigned char *openserSIPMethodName;
+	unsigned char *kamailioSIPMethodName;
 	
-	long openserSIPMethodName_len;
+	long kamailioSIPMethodName_len;
 
 	void * data;
 
-} openserSIPMethodSupportedTable_context;
+} kamailioSIPMethodSupportedTable_context;
 
 
-/* Initializes the openserSIPMethodSupportedTable, and populates the tables 
+/* Initializes the kamailioSIPMethodSupportedTable, and populates the tables 
  * contents */
-void init_openserSIPMethodSupportedTable(void);
+void init_kamailioSIPMethodSupportedTable(void);
 
-/* Defines openserSIPMethodSupportedTable's structure and callback mechanisms */
-void initialize_table_openserSIPMethodSupportedTable(void);
+/* Defines kamailioSIPMethodSupportedTable's structure and callback mechanisms */
+void initialize_table_kamailioSIPMethodSupportedTable(void);
 
 
 /* 
@@ -83,36 +83,36 @@ void initialize_table_openserSIPMethodSupportedTable(void);
  *
  * The function is pretty much left as is from the auto-generated code. 
  */
-int openserSIPMethodSupportedTable_get_value(netsnmp_request_info *, 
+int kamailioSIPMethodSupportedTable_get_value(netsnmp_request_info *, 
 		netsnmp_index *, netsnmp_table_request_info *);
 
-const openserSIPMethodSupportedTable_context * 
-	openserSIPMethodSupportedTable_get_by_idx(netsnmp_index *);
+const kamailioSIPMethodSupportedTable_context * 
+	kamailioSIPMethodSupportedTable_get_by_idx(netsnmp_index *);
 
-const openserSIPMethodSupportedTable_context * 
-	openserSIPMethodSupportedTable_get_by_idx_rs(netsnmp_index *,
+const kamailioSIPMethodSupportedTable_context * 
+	kamailioSIPMethodSupportedTable_get_by_idx_rs(netsnmp_index *,
 			int row_status);
 
 /*
  * oid declarations
  */
-extern oid    openserSIPMethodSupportedTable_oid[];
-extern size_t openserSIPMethodSupportedTable_oid_len;
+extern oid    kamailioSIPMethodSupportedTable_oid[];
+extern size_t kamailioSIPMethodSupportedTable_oid_len;
 
-#define openserSIPMethodSupportedTable_TABLE_OID OPENSER_OID,3,1,1,1,1,7
+#define kamailioSIPMethodSupportedTable_TABLE_OID KAMAILIO_OID,3,1,1,1,1,7
     
 /*
- * column number definitions for table openserSIPMethodSupportedTable
+ * column number definitions for table kamailioSIPMethodSupportedTable
  */
-#define COLUMN_OPENSERSIPMETHODSUPPORTEDINDEX  1
-#define COLUMN_OPENSERSIPMETHODNAME            2
+#define COLUMN_KAMAILIOSIPMETHODSUPPORTEDINDEX  1
+#define COLUMN_KAMAILIOSIPMETHODNAME            2
 
-#define openserSIPMethodSupportedTable_COL_MIN 2
-#define openserSIPMethodSupportedTable_COL_MAX 2
+#define kamailioSIPMethodSupportedTable_COL_MIN 2
+#define kamailioSIPMethodSupportedTable_COL_MAX 2
 
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /** OPENSERSIPMETHODSUPPORTEDTABLE_H */
+#endif /** KAMAILIOSIPMETHODSUPPORTEDTABLE_H */

modules_k/snmpstats/snmpSIPPortTable.c

@@ -28,8 +28,8 @@
  * 
  * Originally Generated with mib2c using mib2c.array-user.conf
  *
- * This file implements the openserSIPPortTable.  For a full description of the table,
- * please see the OPENSER-SIP-COMMON-MIB.
+ * This file implements the kamailioSIPPortTable.  For a full description of the table,
+ * please see the KAMAILIO-SIP-COMMON-MIB.
  *
  */
 
@@ -48,8 +48,8 @@
 static     netsnmp_handler_registration *my_handler = NULL;
 static     netsnmp_table_array_callbacks cb;
 
-oid    openserSIPPortTable_oid[]   = { openserSIPPortTable_TABLE_OID };
-size_t openserSIPPortTable_oid_len = OID_LENGTH(openserSIPPortTable_oid);
+oid    kamailioSIPPortTable_oid[]   = { kamailioSIPPortTable_TABLE_OID };
+size_t kamailioSIPPortTable_oid_len = OID_LENGTH(kamailioSIPPortTable_oid);
 
 
 /* Returns a new OID with the following structure:
@@ -75,7 +75,7 @@ oid *createIndex(int ipType, int *ipAddress, int *sizeOfOID)
 	currentOIDIndex = pkg_malloc((*sizeOfOID) * sizeof(oid));
 
 	if (currentOIDIndex == NULL) {
-		LM_ERR("failed to create a row for openserSIPPortTable\n");
+		LM_ERR("failed to create a row for kamailioSIPPortTable\n");
 		*sizeOfOID = 0;
 		return NULL;
 	}
@@ -101,7 +101,7 @@ oid *createIndex(int ipType, int *ipAddress, int *sizeOfOID)
  *
  * Note: NULL will be returned on an error 
  */
-openserSIPPortTable_context *getRow(int ipType, int *ipAddress) 
+kamailioSIPPortTable_context *getRow(int ipType, int *ipAddress) 
 {
 	int lengthOfOID;
 	oid *currentOIDIndex = createIndex(ipType, ipAddress, &lengthOfOID);
@@ -116,7 +116,7 @@ openserSIPPortTable_context *getRow(int ipType, int *ipAddress)
 	theIndex.oids = currentOIDIndex;
 	theIndex.len  = lengthOfOID;
 
-	openserSIPPortTable_context *rowToReturn;
+	kamailioSIPPortTable_context *rowToReturn;
 
 	/* Lets check to see if there is an existing row. */
 	rowToReturn = CONTAINER_FIND(cb.container, &theIndex);
@@ -133,7 +133,7 @@ openserSIPPortTable_context *getRow(int ipType, int *ipAddress)
 	}
 	
 	/* If we are here then the row doesn't exist yet.  So lets create it. */
-	rowToReturn = SNMP_MALLOC_TYPEDEF(openserSIPPortTable_context);
+	rowToReturn = SNMP_MALLOC_TYPEDEF(kamailioSIPPortTable_context);
 
 	/* Not enough memory to create the new row. */
 	if (rowToReturn == NULL) {
@@ -145,8 +145,8 @@ openserSIPPortTable_context *getRow(int ipType, int *ipAddress)
 	rowToReturn->index.len  = lengthOfOID;
 	rowToReturn->index.oids = currentOIDIndex;
 
-	memcpy(rowToReturn->openserSIPStringIndex, currentOIDIndex, NUM_IP_OCTETS + 3);
-	rowToReturn->openserSIPStringIndex_len = NUM_IP_OCTETS + 3;
+	memcpy(rowToReturn->kamailioSIPStringIndex, currentOIDIndex, NUM_IP_OCTETS + 3);
+	rowToReturn->kamailioSIPStringIndex_len = NUM_IP_OCTETS + 3;
 
 	/* Insert the new row into the table */
 	CONTAINER_INSERT(cb.container, rowToReturn);
@@ -165,7 +165,7 @@ openserSIPPortTable_context *getRow(int ipType, int *ipAddress)
 void createRowsFromIPList(int *theList, int listSize, int protocol, 
 		int *snmpIndex) {
 
-	openserSIPPortTable_context *currentRow;
+	kamailioSIPPortTable_context *currentRow;
 	
 	int curIndexOfIP;
 	int curSocketIdx;
@@ -199,27 +199,27 @@ void createRowsFromIPList(int *theList, int listSize, int protocol,
 
 		if (currentRow == NULL) {
 			LM_ERR("failed to create all the "
-					"rows for the openserSIPPortTable\n");
+					"rows for the kamailioSIPPortTable\n");
 			return;
 		}
 
-		currentRow->openserSIPTransportRcv[0]  |= valueToAssign;
-		currentRow->openserSIPTransportRcv_len = 1;
+		currentRow->kamailioSIPTransportRcv[0]  |= valueToAssign;
+		currentRow->kamailioSIPTransportRcv_len = 1;
 	}
 }
 
 /*
- * Initializes the openserSIPPortTable module.  
+ * Initializes the kamailioSIPPortTable module.  
  *
  * Specifically, this function will define the tables structure, and then
- * populate it with the ports and transports that OpenSER is listening on.
+ * populate it with the ports and transports that Kamailio is listening on.
  *
  */
-void init_openserSIPPortTable(void)
+void init_kamailioSIPPortTable(void)
 {
 	int curSNMPIndex = 0;
 
-	initialize_table_openserSIPPortTable();
+	initialize_table_kamailioSIPPortTable();
 
 	int *UDPList = NULL;
 	int *TCPList = NULL;
@@ -246,13 +246,13 @@ void init_openserSIPPortTable(void)
 }
 
  
-/* Initialize the openserSIPPortTable table by defining how it is structured */
-void initialize_table_openserSIPPortTable(void)
+/* Initialize the kamailioSIPPortTable table by defining how it is structured */
+void initialize_table_kamailioSIPPortTable(void)
 {
 	netsnmp_table_registration_info *table_info;
 
 	if(my_handler) {
-		snmp_log(LOG_ERR, "initialize_table_openserSIPPortTable_handler"
+		snmp_log(LOG_ERR, "initialize_table_kamailioSIPPortTable_handler"
 				"called again\n");
 		return;
 	}
@@ -262,35 +262,35 @@ void initialize_table_openserSIPPortTable(void)
 	/* create the table structure itself */
 	table_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_registration_info);
 
-	my_handler = netsnmp_create_handler_registration("openserSIPPortTable",
+	my_handler = netsnmp_create_handler_registration("kamailioSIPPortTable",
 			netsnmp_table_array_helper_handler,
-			openserSIPPortTable_oid,
-			openserSIPPortTable_oid_len,
+			kamailioSIPPortTable_oid,
+			kamailioSIPPortTable_oid_len,
 			HANDLER_CAN_RONLY);
     
 	if (!my_handler || !table_info) {
 		snmp_log(LOG_ERR, "malloc failed in "
-			 "initialize_table_openserSIPPortTable_handler\n");
+			 "initialize_table_kamailioSIPPortTable_handler\n");
 		return; /** mallocs failed */
 	}
 
 	/* Set up the table's structural definition */
 	
-	/* index: openserSIPPortIndex */
+	/* index: kamailioSIPPortIndex */
 	netsnmp_table_helper_add_index(table_info, ASN_OCTET_STR);
 
-	table_info->min_column = openserSIPPortTable_COL_MIN;
-	table_info->max_column = openserSIPPortTable_COL_MAX;
+	table_info->min_column = kamailioSIPPortTable_COL_MIN;
+	table_info->max_column = kamailioSIPPortTable_COL_MAX;
 
 	/* register the table with the master agent */
-	cb.get_value = openserSIPPortTable_get_value;
-	cb.container = netsnmp_container_find("openserSIPPortTable_primary:"
-			"openserSIPPortTable:"
+	cb.get_value = kamailioSIPPortTable_get_value;
+	cb.container = netsnmp_container_find("kamailioSIPPortTable_primary:"
+			"kamailioSIPPortTable:"
 			"table_container");
 
 	
-	DEBUGMSGTL(("initialize_table_openserSIPPortTable",
-				"Registering table openserSIPPortTable "
+	DEBUGMSGTL(("initialize_table_kamailioSIPPortTable",
+				"Registering table kamailioSIPPortTable "
 				"as a table array\n"));
 	
 	netsnmp_table_container_register(my_handler, table_info, &cb,
@@ -302,29 +302,29 @@ void initialize_table_openserSIPPortTable(void)
  *
  * The function is mostly left in its auto-generated form 
  */
-int openserSIPPortTable_get_value(netsnmp_request_info *request, 
+int kamailioSIPPortTable_get_value(netsnmp_request_info *request, 
 		netsnmp_index *item,
 		netsnmp_table_request_info *table_info )
 {
 	netsnmp_variable_list *var = request->requestvb;
 
-	openserSIPPortTable_context *context = 
-		(openserSIPPortTable_context *)item;
+	kamailioSIPPortTable_context *context = 
+		(kamailioSIPPortTable_context *)item;
 
 	switch(table_info->colnum) 
 	{
 		
-		case COLUMN_OPENSERSIPTRANSPORTRCV:
-			/** OpenSERSIPTransportProtocol = ASN_OCTET_STR */
+		case COLUMN_KAMAILIOSIPTRANSPORTRCV:
+			/** KamailioSIPTransportProtocol = ASN_OCTET_STR */
 			snmp_set_var_typed_value(var, ASN_OCTET_STR,
 					(unsigned char *)
-					&context->openserSIPTransportRcv,
-					context->openserSIPTransportRcv_len );
+					&context->kamailioSIPTransportRcv,
+					context->kamailioSIPTransportRcv_len );
 			break;
 
 		default: /** We shouldn't get here */
 			snmp_log(LOG_ERR, "unknown column in "
-					"openserSIPPortTable_get_value\n");
+					"kamailioSIPPortTable_get_value\n");
 			return SNMP_ERR_GENERR;
 	}
 
@@ -332,10 +332,10 @@ int openserSIPPortTable_get_value(netsnmp_request_info *request,
 }
 
 /* Auto-generated function */
-const openserSIPPortTable_context *
-openserSIPPortTable_get_by_idx(netsnmp_index * hdr)
+const kamailioSIPPortTable_context *
+kamailioSIPPortTable_get_by_idx(netsnmp_index * hdr)
 {
-	return (const openserSIPPortTable_context *)
+	return (const kamailioSIPPortTable_context *)
 		CONTAINER_FIND(cb.container, hdr );
 }
 

modules_k/snmpstats/snmpSIPPortTable.h

@@ -26,16 +26,16 @@
  * --------
  * 2006-11-23 initial version (jmagder)
  * 2007-02-16 Moved all OID registrations from the experimental branch to 
- *            OpenSER's IANA assigned enterprise branch. (jmagder)
+ *            Kamailio's IANA assigned enterprise branch. (jmagder)
  * 
  * Originally Generated with Mib2c using mib2c.array-user.conf.
  *
- * This file defines the openserSIPPortTable prototypes.  For a full description
- * of the table, please see the OPENSER-SIP-COMMON-MIB.
+ * This file defines the kamailioSIPPortTable prototypes.  For a full description
+ * of the table, please see the KAMAILIO-SIP-COMMON-MIB.
  */
 
-#ifndef OPENSERSIPPORTTABLE_H
-#define OPENSERSIPPORTTABLE_H
+#ifndef KAMAILIOSIPPORTTABLE_H
+#define KAMAILIOSIPPORTTABLE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -50,68 +50,68 @@ extern "C" {
 #define SIP_PORT_TABLE_STR_INDEX_SIZE 10
 
 /* This strucutre represents a single row in the table. */
-typedef struct openserSIPPortTable_context_s 
+typedef struct kamailioSIPPortTable_context_s 
 {
 
 	netsnmp_index index; 
 	
-	unsigned char openserSIPStringIndex[SIP_PORT_TABLE_STR_INDEX_SIZE];
-	unsigned long openserSIPStringIndex_len;
+	unsigned char kamailioSIPStringIndex[SIP_PORT_TABLE_STR_INDEX_SIZE];
+	unsigned long kamailioSIPStringIndex_len;
 
-	unsigned char openserSIPTransportRcv[2];
-	long openserSIPTransportRcv_len;
+	unsigned char kamailioSIPTransportRcv[2];
+	long kamailioSIPTransportRcv_len;
 
 	void * data;
 
-} openserSIPPortTable_context;
+} kamailioSIPPortTable_context;
 
 
 /*
- * Initializes the openserSIPPortTable module.  
+ * Initializes the kamailioSIPPortTable module.  
  *
  * Specifically, this function will define the tables structure, and then
- * populate it with the ports and transports that OpenSER is listening on.
+ * populate it with the ports and transports that Kamailio is listening on.
  *
  */
-void  init_openserSIPPortTable(void);
+void  init_kamailioSIPPortTable(void);
 
 
-/* Initialize the openserSIPPortTable table by defining how it is structured */
-void  initialize_table_openserSIPPortTable(void);
+/* Initialize the kamailioSIPPortTable table by defining how it is structured */
+void  initialize_table_kamailioSIPPortTable(void);
 
 
 /*
  * This routine is called to process get requests for elements of the table.
  * The function is mostly left in its auto-generated form 
  */
-int   openserSIPPortTable_get_value(netsnmp_request_info *, netsnmp_index *, 
+int   kamailioSIPPortTable_get_value(netsnmp_request_info *, netsnmp_index *, 
 		netsnmp_table_request_info *);
 
-const openserSIPPortTable_context * openserSIPPortTable_get_by_idx(
+const kamailioSIPPortTable_context * kamailioSIPPortTable_get_by_idx(
 		netsnmp_index *);
 
-const openserSIPPortTable_context * openserSIPPortTable_get_by_idx_rs(
+const kamailioSIPPortTable_context * kamailioSIPPortTable_get_by_idx_rs(
 		netsnmp_index *, int row_status);
 
 /*
  * oid declarations
  */
-extern oid    openserSIPPortTable_oid[];
-extern size_t openserSIPPortTable_oid_len;
+extern oid    kamailioSIPPortTable_oid[];
+extern size_t kamailioSIPPortTable_oid_len;
 
-#define openserSIPPortTable_TABLE_OID OPENSER_OID,3,1,1,1,1,5
+#define kamailioSIPPortTable_TABLE_OID KAMAILIO_OID,3,1,1,1,1,5
 	
 /*
- * column number definitions for table openserSIPPortTable
+ * column number definitions for table kamailioSIPPortTable
  */
 
-#define COLUMN_OPENSERSIPTRANSPORTRCV 4
+#define COLUMN_KAMAILIOSIPTRANSPORTRCV 4
 
-#define openserSIPPortTable_COL_MIN 4
-#define openserSIPPortTable_COL_MAX 4
+#define kamailioSIPPortTable_COL_MIN 4
+#define kamailioSIPPortTable_COL_MAX 4
 
 
 #ifdef __cplusplus
 }
 #endif
-#endif /** OPENSERSIPPORTTABLE_H */
+#endif /** KAMAILIOSIPPORTTABLE_H */

modules_k/snmpstats/snmpSIPRegUserLookupTable.c

@@ -29,8 +29,8 @@
  * Note: this file originally auto-generated by mib2c using 
  * mib2c.array-user.conf
  *
- * This file implements the openserSIPRegUserLookupTable.  For a full
- * description of the table, please see the OPENSER-SIP-SERVER-MIB.
+ * This file implements the kamailioSIPRegUserLookupTable.  For a full
+ * description of the table, please see the KAMAILIO-SIP-SERVER-MIB.
  *
  * This file is much larger and more complicated than the files for other
  * tables.  This is because the table is settable, bringing a lot of SNMP
@@ -40,23 +40,23 @@
  * The functions that have been modified to implement this table are the
  * following:
  *
- * 1) openserSIPRegUserLookupTable_extract_index() 
+ * 1) kamailioSIPRegUserLookupTable_extract_index() 
  *
  *    - Modified to fail if the index is invalid.  The index is invalid if it
  *      does not match up with the global userLookupCounter.
  *
- * 2) openserSIPRegUserLookupTable_can_[activate|deactivate|delete]()
+ * 2) kamailioSIPRegUserLookupTable_can_[activate|deactivate|delete]()
  *   
  *    - Simplified to always allow activation/deactivation/deletion. 
  *
- * 3) openserSIPRegUserLookupTable_set_reserve1()
+ * 3) kamailioSIPRegUserLookupTable_set_reserve1()
  *
  *    - The reserve1 phase passes if the row is new, and the rowStatus column
  *      is being set to 'createAndGo'
  *    - The reserve1 phase passes if the row is not new, and the rowStatus
  *      column is being set to 'destroy'
  *
- * 4) openserSIPRegUserLookupTable_set_action()
+ * 4) kamailioSIPRegUserLookupTable_set_action()
  *
  *    - The function was modified to populate the row with the userIndex of the
  *      supplied URI if that URI was found on the system, and set the rowStatus
@@ -80,27 +80,27 @@
 static netsnmp_handler_registration *my_handler = NULL;
 static netsnmp_table_array_callbacks cb;
 
-oid openserSIPRegUserLookupTable_oid[] = { 
-	openserSIPRegUserLookupTable_TABLE_OID };
+oid kamailioSIPRegUserLookupTable_oid[] = { 
+	kamailioSIPRegUserLookupTable_TABLE_OID };
 
-size_t openserSIPRegUserLookupTable_oid_len = 
-	OID_LENGTH(openserSIPRegUserLookupTable_oid);
+size_t kamailioSIPRegUserLookupTable_oid_len = 
+	OID_LENGTH(kamailioSIPRegUserLookupTable_oid);
 
 
 /*
- * Initializes the openserSIPRegUserLookupTable table.  This step is easier
+ * Initializes the kamailioSIPRegUserLookupTable table.  This step is easier
  * than in the other tables because there is no table population.  All table
  * population takes place during run time. 
  */
-void init_openserSIPRegUserLookupTable(void)
+void init_kamailioSIPRegUserLookupTable(void)
 {
-	initialize_table_openserSIPRegUserLookupTable();
+	initialize_table_kamailioSIPRegUserLookupTable();
 }
 
 /* the *_row_copy routine */
-static int openserSIPRegUserLookupTable_row_copy(
-		openserSIPRegUserLookupTable_context * dst,
-		openserSIPRegUserLookupTable_context * src)
+static int kamailioSIPRegUserLookupTable_row_copy(
+		kamailioSIPRegUserLookupTable_context * dst,
+		kamailioSIPRegUserLookupTable_context * src)
 {
 	if(!dst||!src)
 	{
@@ -123,11 +123,11 @@ static int openserSIPRegUserLookupTable_row_copy(
 	dst->index.len = src->index.len;
 	
 	/* Copy out almost all components of the structure.  We don't copy out
-	 * the openserSIPRegUSerLookupURI (or its length).  */
-	dst->openserSIPRegUserLookupIndex     = src->openserSIPRegUserLookupIndex;
-	dst->openserSIPRegUserIndex           = src->openserSIPRegUserIndex;
-	dst->openserSIPRegUserLookupRowStatus = 
-		src->openserSIPRegUserLookupRowStatus;
+	 * the kamailioSIPRegUSerLookupURI (or its length).  */
+	dst->kamailioSIPRegUserLookupIndex     = src->kamailioSIPRegUserLookupIndex;
+	dst->kamailioSIPRegUserIndex           = src->kamailioSIPRegUserIndex;
+	dst->kamailioSIPRegUserLookupRowStatus = 
+		src->kamailioSIPRegUserLookupRowStatus;
 
 	return 0;
 }
@@ -147,8 +147,8 @@ static int openserSIPRegUserLookupTable_row_copy(
  *   2) It doesn't match the global userLookupIndex. (As per MIB specs)
  *
  */
-int openserSIPRegUserLookupTable_extract_index(
-		openserSIPRegUserLookupTable_context * ctx, 
+int kamailioSIPRegUserLookupTable_extract_index(
+		kamailioSIPRegUserLookupTable_context * ctx, 
 		netsnmp_index * hdr)
 {
 	/*
@@ -157,7 +157,7 @@ int openserSIPRegUserLookupTable_extract_index(
 	 * extract index uses varbinds (netsnmp_variable_list) to parse
 	 * the index OID into the individual components for each index part.
 	 */
-	netsnmp_variable_list var_openserSIPRegUserLookupIndex;
+	netsnmp_variable_list var_kamailioSIPRegUserLookupIndex;
 	int err;
 
 	/* copy index, if provided */
@@ -172,37 +172,37 @@ int openserSIPRegUserLookupTable_extract_index(
 	}
 
 	/* Set up the index */
-	memset(&var_openserSIPRegUserLookupIndex, 0x00, 
-			sizeof(var_openserSIPRegUserLookupIndex));
+	memset(&var_kamailioSIPRegUserLookupIndex, 0x00, 
+			sizeof(var_kamailioSIPRegUserLookupIndex));
 
-	var_openserSIPRegUserLookupIndex.type = ASN_UNSIGNED;
-	var_openserSIPRegUserLookupIndex.next_variable = NULL;
+	var_kamailioSIPRegUserLookupIndex.type = ASN_UNSIGNED;
+	var_kamailioSIPRegUserLookupIndex.next_variable = NULL;
 
 
 	/* parse the oid into the individual index components */
 	err = parse_oid_indexes( hdr->oids, hdr->len, 
-			&var_openserSIPRegUserLookupIndex );
+			&var_kamailioSIPRegUserLookupIndex );
 
 	if (err == SNMP_ERR_NOERROR) {
 		
 		/* copy index components into the context structure */
-		ctx->openserSIPRegUserLookupIndex = 
-			*var_openserSIPRegUserLookupIndex.val.integer;
+		ctx->kamailioSIPRegUserLookupIndex = 
+			*var_kamailioSIPRegUserLookupIndex.val.integer;
 
 		/* 
 		 * Check to make sure that the index corresponds to the
 		 * global_userLookupCounter, as per the MIB specifications. 
 		 */
-		if (*var_openserSIPRegUserLookupIndex.val.integer != 
+		if (*var_kamailioSIPRegUserLookupIndex.val.integer != 
 				global_UserLookupCounter || 
-		    *var_openserSIPRegUserLookupIndex.val.integer < 1) {
+		    *var_kamailioSIPRegUserLookupIndex.val.integer < 1) {
 			err = -1;
 		}
 
 	}
 
 	/* parsing may have allocated memory. free it. */
-	snmp_reset_var_buffers( &var_openserSIPRegUserLookupIndex );
+	snmp_reset_var_buffers( &var_kamailioSIPRegUserLookupIndex );
 
 	return err;
 }
@@ -215,9 +215,9 @@ int openserSIPRegUserLookupTable_extract_index(
  *
  * For our purposes, we have no need for this check, so we always return 1.
  */
-int openserSIPRegUserLookupTable_can_activate(
-		openserSIPRegUserLookupTable_context *undo_ctx,
-		openserSIPRegUserLookupTable_context *row_ctx,
+int kamailioSIPRegUserLookupTable_can_activate(
+		kamailioSIPRegUserLookupTable_context *undo_ctx,
+		kamailioSIPRegUserLookupTable_context *row_ctx,
 		netsnmp_request_group * rg)
 {
 	return 1;
@@ -233,9 +233,9 @@ int openserSIPRegUserLookupTable_can_activate(
  * Since this table has no reason why this shouldn't be allowed, we always
  * return 1;
  */
-int openserSIPRegUserLookupTable_can_deactivate(
-		openserSIPRegUserLookupTable_context *undo_ctx,
-		openserSIPRegUserLookupTable_context *row_ctx,
+int kamailioSIPRegUserLookupTable_can_deactivate(
+		kamailioSIPRegUserLookupTable_context *undo_ctx,
+		kamailioSIPRegUserLookupTable_context *row_ctx,
 		netsnmp_request_group * rg)
 {
 	return 1;
@@ -250,12 +250,12 @@ int openserSIPRegUserLookupTable_can_deactivate(
  * Since this table ha no reason why row deletion shouldn't be allowed, we
  * always return 1, unless we can't deactivate.  
  */
-int openserSIPRegUserLookupTable_can_delete(
-		openserSIPRegUserLookupTable_context *undo_ctx,
-		openserSIPRegUserLookupTable_context *row_ctx,
+int kamailioSIPRegUserLookupTable_can_delete(
+		kamailioSIPRegUserLookupTable_context *undo_ctx,
+		kamailioSIPRegUserLookupTable_context *row_ctx,
 		netsnmp_request_group * rg)
 {
-	if(openserSIPRegUserLookupTable_can_deactivate(undo_ctx,row_ctx,rg) != 1)
+	if(kamailioSIPRegUserLookupTable_can_deactivate(undo_ctx,row_ctx,rg) != 1)
 		return 0;
 	
 	return 1;
@@ -269,14 +269,14 @@ int openserSIPRegUserLookupTable_can_delete(
  * *_set_reserve_* functions can be used to prevent the row from being inserted
  * into the table even if the row passes any preliminary checks set here. 
  *
- * Returns a newly allocated openserSIPRegUserLookupTable_context structure (a
+ * Returns a newly allocated kamailioSIPRegUserLookupTable_context structure (a
  * row in the table) if the indexes are legal.  NULL will be returned otherwise. 
  */
-openserSIPRegUserLookupTable_context *
-openserSIPRegUserLookupTable_create_row( netsnmp_index* hdr)
+kamailioSIPRegUserLookupTable_context *
+kamailioSIPRegUserLookupTable_create_row( netsnmp_index* hdr)
 {
-	openserSIPRegUserLookupTable_context * ctx =
-		SNMP_MALLOC_TYPEDEF(openserSIPRegUserLookupTable_context);
+	kamailioSIPRegUserLookupTable_context * ctx =
+		SNMP_MALLOC_TYPEDEF(kamailioSIPRegUserLookupTable_context);
 
 	if (!ctx) 
 	{
@@ -288,7 +288,7 @@ openserSIPRegUserLookupTable_create_row( netsnmp_index* hdr)
 	 * auto-generated version in that the function will fail if index is
 	 * somehow invalid. 
 	 */
-	if(openserSIPRegUserLookupTable_extract_index( ctx, hdr )) 
+	if(kamailioSIPRegUserLookupTable_extract_index( ctx, hdr )) 
 	{
 
 		if (NULL != ctx->index.oids)
@@ -301,10 +301,10 @@ openserSIPRegUserLookupTable_create_row( netsnmp_index* hdr)
 		return NULL;
 	}
 
-	ctx->openserSIPRegUserLookupURI       = NULL;
-	ctx->openserSIPRegUserLookupURI_len   = 0;
-	ctx->openserSIPRegUserIndex           = 0;
-	ctx->openserSIPRegUserLookupRowStatus = 0;
+	ctx->kamailioSIPRegUserLookupURI       = NULL;
+	ctx->kamailioSIPRegUserLookupURI_len   = 0;
+	ctx->kamailioSIPRegUserIndex           = 0;
+	ctx->kamailioSIPRegUserLookupRowStatus = 0;
 
 	return ctx;
 }
@@ -312,20 +312,20 @@ openserSIPRegUserLookupTable_create_row( netsnmp_index* hdr)
 /* 
  * Auto-generated function.  The *_duplicate row routine
  */
-openserSIPRegUserLookupTable_context *
-openserSIPRegUserLookupTable_duplicate_row( 
-		openserSIPRegUserLookupTable_context * row_ctx)
+kamailioSIPRegUserLookupTable_context *
+kamailioSIPRegUserLookupTable_duplicate_row( 
+		kamailioSIPRegUserLookupTable_context * row_ctx)
 {
-	openserSIPRegUserLookupTable_context * dup;
+	kamailioSIPRegUserLookupTable_context * dup;
 
 	if(!row_ctx)
 		return NULL;
 
-	dup = SNMP_MALLOC_TYPEDEF(openserSIPRegUserLookupTable_context);
+	dup = SNMP_MALLOC_TYPEDEF(kamailioSIPRegUserLookupTable_context);
 	if(!dup)
 		return NULL;
 		
-	if(openserSIPRegUserLookupTable_row_copy(dup,row_ctx)) {
+	if(kamailioSIPRegUserLookupTable_row_copy(dup,row_ctx)) {
 		free(dup);
 		dup = NULL;
 	}
@@ -340,8 +340,8 @@ openserSIPRegUserLookupTable_duplicate_row(
  * deleted.  However, in our implementation there is never a reason why this
  * function can't be called. 
  */
-netsnmp_index * openserSIPRegUserLookupTable_delete_row(
-		openserSIPRegUserLookupTable_context * ctx )
+netsnmp_index * kamailioSIPRegUserLookupTable_delete_row(
+		kamailioSIPRegUserLookupTable_context * ctx )
 {
 	if(ctx->index.oids)
 	{
@@ -349,9 +349,9 @@ netsnmp_index * openserSIPRegUserLookupTable_delete_row(
 	}
 
 
-	if (ctx->openserSIPRegUserLookupURI != NULL) 
+	if (ctx->kamailioSIPRegUserLookupURI != NULL) 
 	{
-		pkg_free(ctx->openserSIPRegUserLookupURI);
+		pkg_free(ctx->kamailioSIPRegUserLookupURI);
 	}
 
 	free( ctx );
@@ -379,10 +379,10 @@ netsnmp_index * openserSIPRegUserLookupTable_delete_row(
  * any other condition is considered illegal, and will result in an SNMP error
  * being returned. 
  */
-void openserSIPRegUserLookupTable_set_reserve1( netsnmp_request_group *rg )
+void kamailioSIPRegUserLookupTable_set_reserve1( netsnmp_request_group *rg )
 {
-	openserSIPRegUserLookupTable_context *row_ctx =
-		(openserSIPRegUserLookupTable_context *)rg->existing_row;
+	kamailioSIPRegUserLookupTable_context *row_ctx =
+		(kamailioSIPRegUserLookupTable_context *)rg->existing_row;
 
 	netsnmp_variable_list *var;
 
@@ -398,10 +398,10 @@ void openserSIPRegUserLookupTable_set_reserve1( netsnmp_request_group *rg )
 		switch(current->tri->colnum) 
 		{
 
-			case COLUMN_OPENSERSIPREGUSERLOOKUPURI:
+			case COLUMN_KAMAILIOSIPREGUSERLOOKUPURI:
 
-				if (row_ctx->openserSIPRegUserLookupRowStatus == 0 ||
-				    row_ctx->openserSIPRegUserLookupRowStatus == 
+				if (row_ctx->kamailioSIPRegUserLookupRowStatus == 0 ||
+				    row_ctx->kamailioSIPRegUserLookupRowStatus == 
 				    TC_ROWSTATUS_NOTREADY) {
 
 				} else {
@@ -410,23 +410,23 @@ void openserSIPRegUserLookupTable_set_reserve1( netsnmp_request_group *rg )
 				
 				break;
 
-			case COLUMN_OPENSERSIPREGUSERLOOKUPROWSTATUS:
+			case COLUMN_KAMAILIOSIPREGUSERLOOKUPROWSTATUS:
 
 				/** RowStatus = ASN_INTEGER */
 				rc = netsnmp_check_vb_type_and_size(var, ASN_INTEGER,
 						sizeof(
-						row_ctx->openserSIPRegUserLookupRowStatus));
+						row_ctx->kamailioSIPRegUserLookupRowStatus));
 			 
 				/* Want to make sure that if it already exists that it
 				 * is setting it to 'destroy', or if it doesn't exist,
 				 * that it is setting it to 'createAndGo' */
-				if (row_ctx->openserSIPRegUserLookupRowStatus == 0 && 
+				if (row_ctx->kamailioSIPRegUserLookupRowStatus == 0 && 
 				    *var->val.integer != TC_ROWSTATUS_CREATEANDGO) 
 				{
 					rc = SNMP_ERR_BADVALUE;
 				} 
 			
-				else if (row_ctx->openserSIPRegUserLookupRowStatus ==
+				else if (row_ctx->kamailioSIPRegUserLookupRowStatus ==
 						TC_ROWSTATUS_ACTIVE && 
 						*var->val.integer != 
 						TC_ROWSTATUS_DESTROY) 
@@ -438,7 +438,7 @@ void openserSIPRegUserLookupTable_set_reserve1( netsnmp_request_group *rg )
 
 			default: /** We shouldn't get here */
 				rc = SNMP_ERR_GENERR;
-				snmp_log(LOG_ERR, "unknown column in openserSIPReg"
+				snmp_log(LOG_ERR, "unknown column in kamailioSIPReg"
 						  "UserLookupTable_set_reserve1\n");
 		}
 
@@ -458,10 +458,10 @@ void openserSIPRegUserLookupTable_set_reserve1( netsnmp_request_group *rg )
  * last-minute conditions not being met.  However, we don't have any such
  * conditions, so we leave the default function as is.
  */
-void openserSIPRegUserLookupTable_set_reserve2( netsnmp_request_group *rg )
+void kamailioSIPRegUserLookupTable_set_reserve2( netsnmp_request_group *rg )
 {
-	openserSIPRegUserLookupTable_context *undo_ctx = 
-		(openserSIPRegUserLookupTable_context *)rg->undo_info;
+	kamailioSIPRegUserLookupTable_context *undo_ctx = 
+		(kamailioSIPRegUserLookupTable_context *)rg->undo_info;
 
 	netsnmp_request_group_item *current;
 
@@ -478,15 +478,15 @@ void openserSIPRegUserLookupTable_set_reserve2( netsnmp_request_group *rg )
 
 		switch(current->tri->colnum) 
 		{
-			case COLUMN_OPENSERSIPREGUSERLOOKUPURI:
+			case COLUMN_KAMAILIOSIPREGUSERLOOKUPURI:
 				break;
 
-			case COLUMN_OPENSERSIPREGUSERLOOKUPROWSTATUS:
+			case COLUMN_KAMAILIOSIPREGUSERLOOKUPROWSTATUS:
 			
 				/** RowStatus = ASN_INTEGER */
 				rc = netsnmp_check_vb_rowstatus(current->ri->requestvb,
 					undo_ctx ? 
-					undo_ctx->openserSIPRegUserLookupRowStatus:0);
+					undo_ctx->kamailioSIPRegUserLookupRowStatus:0);
 
 				rg->rg_void = current->ri;
 	
@@ -516,7 +516,7 @@ void openserSIPRegUserLookupTable_set_reserve2( netsnmp_request_group *rg )
  *
  * All other handling is auto-generated.
  */
-void openserSIPRegUserLookupTable_set_action( netsnmp_request_group *rg )
+void kamailioSIPRegUserLookupTable_set_action( netsnmp_request_group *rg )
 {	
 	/* First things first, we need to consume the interprocess buffer, in
 	 * case something has changed. We want to return the freshest data. */
@@ -526,11 +526,11 @@ void openserSIPRegUserLookupTable_set_action( netsnmp_request_group *rg )
 
 	netsnmp_variable_list *var;
 
-	openserSIPRegUserLookupTable_context *row_ctx = 
-		(openserSIPRegUserLookupTable_context *)rg->existing_row;
+	kamailioSIPRegUserLookupTable_context *row_ctx = 
+		(kamailioSIPRegUserLookupTable_context *)rg->existing_row;
 
-	openserSIPRegUserLookupTable_context *undo_ctx = 
-		(openserSIPRegUserLookupTable_context *)rg->undo_info;
+	kamailioSIPRegUserLookupTable_context *undo_ctx = 
+		(kamailioSIPRegUserLookupTable_context *)rg->undo_info;
 
 	netsnmp_request_group_item *current;
 
@@ -544,12 +544,12 @@ void openserSIPRegUserLookupTable_set_action( netsnmp_request_group *rg )
 		switch(current->tri->colnum) 
 		{
 
-			case COLUMN_OPENSERSIPREGUSERLOOKUPURI:
+			case COLUMN_KAMAILIOSIPREGUSERLOOKUPURI:
 
-				row_ctx->openserSIPRegUserLookupURI = 
+				row_ctx->kamailioSIPRegUserLookupURI = 
 					pkg_malloc(sizeof(char)*(var->val_len + 1));
 
-				memcpy(row_ctx->openserSIPRegUserLookupURI,
+				memcpy(row_ctx->kamailioSIPRegUserLookupURI,
 						var->val.string,
 						var->val_len);
 			
@@ -558,9 +558,9 @@ void openserSIPRegUserLookupTable_set_action( netsnmp_request_group *rg )
 				 * though, so we have to add this on to the end.  The +1
 				 * in the malloc makes sure of the extra space for us.
 				 */	
-				row_ctx->openserSIPRegUserLookupURI[var->val_len] = '\0';
+				row_ctx->kamailioSIPRegUserLookupURI[var->val_len] = '\0';
 
-				row_ctx->openserSIPRegUserLookupURI_len = var->val_len;
+				row_ctx->kamailioSIPRegUserLookupURI_len = var->val_len;
 		
 				/* Do the lookup.  If we could find the record, then set
 				 * the index and the row status to active.  Otherwise,
@@ -568,28 +568,28 @@ void openserSIPRegUserLookupTable_set_action( netsnmp_request_group *rg )
 				hashRecord = 
 					findHashRecord(hashTable, 
 						(char *)
-						row_ctx->openserSIPRegUserLookupURI,
+						row_ctx->kamailioSIPRegUserLookupURI,
 						HASH_SIZE);
 
 				if (hashRecord == NULL) 
 				{
-					row_ctx->openserSIPRegUserIndex = 0;				
-					row_ctx->openserSIPRegUserLookupRowStatus = 
+					row_ctx->kamailioSIPRegUserIndex = 0;				
+					row_ctx->kamailioSIPRegUserLookupRowStatus = 
 						TC_ROWSTATUS_NOTINSERVICE;
 				} 
 				else 
 				{
-					row_ctx->openserSIPRegUserIndex = 
+					row_ctx->kamailioSIPRegUserIndex = 
 						hashRecord->userIndex;
-					row_ctx->openserSIPRegUserLookupRowStatus = 
+					row_ctx->kamailioSIPRegUserLookupRowStatus = 
 						TC_ROWSTATUS_ACTIVE;
 				}
 
 				break;
 
-			case COLUMN_OPENSERSIPREGUSERLOOKUPROWSTATUS:
+			case COLUMN_KAMAILIOSIPREGUSERLOOKUPROWSTATUS:
 
-				row_ctx->openserSIPRegUserLookupRowStatus = 
+				row_ctx->kamailioSIPRegUserLookupRowStatus = 
 					*var->val.integer;
 
 				if (*var->val.integer == TC_ROWSTATUS_CREATEANDGO) 
@@ -597,7 +597,7 @@ void openserSIPRegUserLookupTable_set_action( netsnmp_request_group *rg )
 					rg->row_created = 1;
 					/* Set to NOT READY until the lookup URI has
 					 * been supplied. */
-					row_ctx->openserSIPRegUserLookupRowStatus =
+					row_ctx->kamailioSIPRegUserLookupRowStatus =
 						TC_ROWSTATUS_NOTREADY; 
 				}
 				else if (*var->val.integer == TC_ROWSTATUS_DESTROY) 
@@ -609,7 +609,7 @@ void openserSIPRegUserLookupTable_set_action( netsnmp_request_group *rg )
 					/* We should never be here, because the RESERVE
 					 * functions should have taken care of all other
 					 * values. */
-				LM_ERR("invalid RowStatus in openserSIPStatusCodesTable\n");
+				LM_ERR("invalid RowStatus in kamailioSIPStatusCodesTable\n");
 				}
 
 				break;
@@ -623,9 +623,9 @@ void openserSIPRegUserLookupTable_set_action( netsnmp_request_group *rg )
 	 * done with all the columns. Could check row related
 	 * requirements here.
 	 */
-#ifndef openserSIPRegUserLookupTable_CAN_MODIFY_ACTIVE_ROW
-	if( undo_ctx && RS_IS_ACTIVE(undo_ctx->openserSIPRegUserLookupRowStatus) &&
-		row_ctx && RS_IS_ACTIVE(row_ctx->openserSIPRegUserLookupRowStatus) ) {
+#ifndef kamailioSIPRegUserLookupTable_CAN_MODIFY_ACTIVE_ROW
+	if( undo_ctx && RS_IS_ACTIVE(undo_ctx->kamailioSIPRegUserLookupRowStatus) &&
+		row_ctx && RS_IS_ACTIVE(row_ctx->kamailioSIPRegUserLookupRowStatus) ) {
 			row_err = 1;
 	}
 #endif
@@ -634,8 +634,8 @@ void openserSIPRegUserLookupTable_set_action( netsnmp_request_group *rg )
 	 * check activation/deactivation
 	 */
 	row_err = netsnmp_table_array_check_row_status(&cb, rg,
-			row_ctx ? &row_ctx->openserSIPRegUserLookupRowStatus : NULL,
-			undo_ctx ? &undo_ctx->openserSIPRegUserLookupRowStatus : NULL);
+			row_ctx ? &row_ctx->kamailioSIPRegUserLookupRowStatus : NULL,
+			undo_ctx ? &undo_ctx->kamailioSIPRegUserLookupRowStatus : NULL);
 
 	if(row_err) {
 		netsnmp_set_mode_request_error(MODE_SET_BEGIN,
@@ -649,7 +649,7 @@ void openserSIPRegUserLookupTable_set_action( netsnmp_request_group *rg )
  * The COMMIT phase is used to do any extra processing after the ACTION phase.
  * In our table, there is nothing to do, so the function body is empty.
  */
-void openserSIPRegUserLookupTable_set_commit( netsnmp_request_group *rg )
+void kamailioSIPRegUserLookupTable_set_commit( netsnmp_request_group *rg )
 {
 
 }
@@ -661,7 +661,7 @@ void openserSIPRegUserLookupTable_set_commit( netsnmp_request_group *rg )
  * all these resources in earlier functions.  So for our purposes, the function
  * body is empty. 
  */
-void openserSIPRegUserLookupTable_set_free( netsnmp_request_group *rg )
+void kamailioSIPRegUserLookupTable_set_free( netsnmp_request_group *rg )
 {
 
 }
@@ -672,24 +672,24 @@ void openserSIPRegUserLookupTable_set_free( netsnmp_request_group *rg )
  * We don't have anything complicated enough to warrant putting anything in this
  * function.  Therefore, its just left with an empty function body. 
  */
-void openserSIPRegUserLookupTable_set_undo( netsnmp_request_group *rg )
+void kamailioSIPRegUserLookupTable_set_undo( netsnmp_request_group *rg )
 {
 
 }
 
 
 /*
- * Initialize the openserSIPRegUserLookupTable table by defining how it is
+ * Initialize the kamailioSIPRegUserLookupTable table by defining how it is
  * structured. 
  *
  * This function is mostly auto-generated.
  */
-void initialize_table_openserSIPRegUserLookupTable(void)
+void initialize_table_kamailioSIPRegUserLookupTable(void)
 {
 	netsnmp_table_registration_info *table_info;
 
 	if(my_handler) {
-		snmp_log(LOG_ERR, "initialize_table_openserSIPRegUserLookup"
+		snmp_log(LOG_ERR, "initialize_table_kamailioSIPRegUserLookup"
 				"Table_handler called again\n");
 		return;
 	}
@@ -700,15 +700,15 @@ void initialize_table_openserSIPRegUserLookupTable(void)
 	table_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_registration_info);
 
 	my_handler = netsnmp_create_handler_registration(
-			"openserSIPRegUserLookupTable",
+			"kamailioSIPRegUserLookupTable",
 			netsnmp_table_array_helper_handler,
-			openserSIPRegUserLookupTable_oid,
-			openserSIPRegUserLookupTable_oid_len,
+			kamailioSIPRegUserLookupTable_oid,
+			kamailioSIPRegUserLookupTable_oid_len,
 			HANDLER_CAN_RWRITE);
 			
 	if (!my_handler || !table_info) {
 		snmp_log(LOG_ERR, "malloc failed in "
-				 "initialize_table_openserSIPRegUserLookup"
+				 "initialize_table_kamailioSIPRegUserLookup"
 				 "Table_handler\n");
 		return; /** mallocs failed */
 	}
@@ -719,45 +719,45 @@ void initialize_table_openserSIPRegUserLookupTable(void)
 
 	netsnmp_table_helper_add_index(table_info, ASN_UNSIGNED);
 
-	table_info->min_column = openserSIPRegUserLookupTable_COL_MIN;
-	table_info->max_column = openserSIPRegUserLookupTable_COL_MAX;
+	table_info->min_column = kamailioSIPRegUserLookupTable_COL_MIN;
+	table_info->max_column = kamailioSIPRegUserLookupTable_COL_MAX;
 
 	/*
 	 * registering the table with the master agent
 	 */
-	cb.get_value = openserSIPRegUserLookupTable_get_value;
+	cb.get_value = kamailioSIPRegUserLookupTable_get_value;
 	cb.container = netsnmp_container_find(
-			"openserSIPRegUserLookupTable_primary:"
-			"openserSIPRegUserLookupTable:"
+			"kamailioSIPRegUserLookupTable_primary:"
+			"kamailioSIPRegUserLookupTable:"
 			"table_container");
 
 	cb.can_set = 1;
 	cb.create_row    = 
-		(UserRowMethod*)openserSIPRegUserLookupTable_create_row;
+		(UserRowMethod*)kamailioSIPRegUserLookupTable_create_row;
 	cb.duplicate_row = 
-		(UserRowMethod*)openserSIPRegUserLookupTable_duplicate_row;
+		(UserRowMethod*)kamailioSIPRegUserLookupTable_duplicate_row;
 	cb.delete_row    = 
-		(UserRowMethod*)openserSIPRegUserLookupTable_delete_row;
+		(UserRowMethod*)kamailioSIPRegUserLookupTable_delete_row;
 	cb.row_copy      = 
 		(Netsnmp_User_Row_Operation *)
-			openserSIPRegUserLookupTable_row_copy;
+			kamailioSIPRegUserLookupTable_row_copy;
 
 	cb.can_activate   = (Netsnmp_User_Row_Action *)
-		openserSIPRegUserLookupTable_can_activate;
+		kamailioSIPRegUserLookupTable_can_activate;
 	cb.can_deactivate = (Netsnmp_User_Row_Action *)
-		openserSIPRegUserLookupTable_can_deactivate;
+		kamailioSIPRegUserLookupTable_can_deactivate;
 	cb.can_delete     = (Netsnmp_User_Row_Action *)
-		openserSIPRegUserLookupTable_can_delete;
+		kamailioSIPRegUserLookupTable_can_delete;
 
-	cb.set_reserve1 = openserSIPRegUserLookupTable_set_reserve1;
-	cb.set_reserve2 = openserSIPRegUserLookupTable_set_reserve2;
-	cb.set_action   = openserSIPRegUserLookupTable_set_action;
-	cb.set_commit   = openserSIPRegUserLookupTable_set_commit;
-	cb.set_free     = openserSIPRegUserLookupTable_set_free;
-	cb.set_undo     = openserSIPRegUserLookupTable_set_undo;
+	cb.set_reserve1 = kamailioSIPRegUserLookupTable_set_reserve1;
+	cb.set_reserve2 = kamailioSIPRegUserLookupTable_set_reserve2;
+	cb.set_action   = kamailioSIPRegUserLookupTable_set_action;
+	cb.set_commit   = kamailioSIPRegUserLookupTable_set_commit;
+	cb.set_free     = kamailioSIPRegUserLookupTable_set_free;
+	cb.set_undo     = kamailioSIPRegUserLookupTable_set_undo;
 
-	DEBUGMSGTL(("initialize_table_openserSIPRegUserLookupTable",
-				"Registering table openserSIPRegUserLookupTable "
+	DEBUGMSGTL(("initialize_table_kamailioSIPRegUserLookupTable",
+				"Registering table kamailioSIPRegUserLookupTable "
 				"as a table array\n"));
 	
 	netsnmp_table_container_register(my_handler, table_info, &cb, 
@@ -768,46 +768,46 @@ void initialize_table_openserSIPRegUserLookupTable(void)
  * This function was auto-generated and didn't need modifications from its
  * auto-generation.  It is called to handle an SNMP GET request. 
  */
-int openserSIPRegUserLookupTable_get_value(
+int kamailioSIPRegUserLookupTable_get_value(
 			netsnmp_request_info *request,
 			netsnmp_index *item,
 			netsnmp_table_request_info *table_info )
 {
 	netsnmp_variable_list *var = request->requestvb;
 
-	openserSIPRegUserLookupTable_context *context =
-		(openserSIPRegUserLookupTable_context *)item;
+	kamailioSIPRegUserLookupTable_context *context =
+		(kamailioSIPRegUserLookupTable_context *)item;
 
 	switch(table_info->colnum) 
 	{
-		case COLUMN_OPENSERSIPREGUSERLOOKUPURI:
+		case COLUMN_KAMAILIOSIPREGUSERLOOKUPURI:
 			/** SnmpAdminString = ASN_OCTET_STR */
 			snmp_set_var_typed_value(var, ASN_OCTET_STR, 
 					(unsigned char*)
-					context->openserSIPRegUserLookupURI,
-					context->openserSIPRegUserLookupURI_len);
+					context->kamailioSIPRegUserLookupURI,
+					context->kamailioSIPRegUserLookupURI_len);
 		break;
 	
-		case COLUMN_OPENSERSIPREGUSERINDEX:
+		case COLUMN_KAMAILIOSIPREGUSERINDEX:
 			/** UNSIGNED32 = ASN_UNSIGNED */
 			snmp_set_var_typed_value(var, ASN_UNSIGNED,
 					 (unsigned char*)
-					 &context->openserSIPRegUserIndex,
-					 sizeof(context->openserSIPRegUserIndex));
+					 &context->kamailioSIPRegUserIndex,
+					 sizeof(context->kamailioSIPRegUserIndex));
 		break;
 	
-		case COLUMN_OPENSERSIPREGUSERLOOKUPROWSTATUS:
+		case COLUMN_KAMAILIOSIPREGUSERLOOKUPROWSTATUS:
 			/** RowStatus = ASN_INTEGER */
 			snmp_set_var_typed_value(var, ASN_INTEGER,
 					(unsigned char*)
-					&context->openserSIPRegUserLookupRowStatus,
+					&context->kamailioSIPRegUserLookupRowStatus,
 					sizeof(
-					context->openserSIPRegUserLookupRowStatus));
+					context->kamailioSIPRegUserLookupRowStatus));
 		break;
 	
 	default: /** We shouldn't get here */
 		snmp_log(LOG_ERR, "unknown column in "
-				 "openserSIPRegUserLookupTable_get_value\n");
+				 "kamailioSIPRegUserLookupTable_get_value\n");
 		return SNMP_ERR_GENERR;
 	}
 
@@ -815,12 +815,12 @@ int openserSIPRegUserLookupTable_get_value(
 }
 
 /*
- * openserSIPRegUserLookupTable_get_by_idx
+ * kamailioSIPRegUserLookupTable_get_by_idx
  */
-const openserSIPRegUserLookupTable_context *
-openserSIPRegUserLookupTable_get_by_idx(netsnmp_index * hdr)
+const kamailioSIPRegUserLookupTable_context *
+kamailioSIPRegUserLookupTable_get_by_idx(netsnmp_index * hdr)
 {
-	return (const openserSIPRegUserLookupTable_context *)
+	return (const kamailioSIPRegUserLookupTable_context *)
 		CONTAINER_FIND(cb.container, hdr );
 }
 

modules_k/snmpstats/snmpSIPRegUserLookupTable.h

@@ -26,13 +26,13 @@
  * --------
  * 2006-11-23 initial version (jmagder)
  * 2007-02-16 Moved all OID registrations from the experimental branch to 
- *            OpenSER's IANA assigned enterprise branch. (jmagder)
+ *            Kamailio's IANA assigned enterprise branch. (jmagder)
  * 
  * Note: this file originally auto-generated by mib2c using 
  * mib2c.array-user.conf,
  *
- * This file implements the openserSIPRegUserLookupTable.  For a full
- * description of the table, please see the OPENSER-SIP-SERVER-MIB.
+ * This file implements the kamailioSIPRegUserLookupTable.  For a full
+ * description of the table, please see the KAMAILIO-SIP-SERVER-MIB.
  *
  * This file consists of many more functions than the other header files.  
  * This is because this table is writable, bringing a lot of SNMP overhead.
@@ -40,20 +40,20 @@
  * Most of the contents are auto-generated (aside from white space and comment
  * changes), and can be ignored.  The functions that have been modified are:
  *
- * 1) openserSIPRegUserLookupTable_extract_index() 
+ * 1) kamailioSIPRegUserLookupTable_extract_index() 
  *
- * 2) openserSIPRegUserLookupTable_can_[activate|deactivate|delete]()
+ * 2) kamailioSIPRegUserLookupTable_can_[activate|deactivate|delete]()
  *
- * 3) openserSIPRegUserLookupTable_set_reserve1()
+ * 3) kamailioSIPRegUserLookupTable_set_reserve1()
  *
- * 4) openserSIPRegUserLookupTable_set_action()
+ * 4) kamailioSIPRegUserLookupTable_set_action()
  *
- * Full details can be found in openserSIPRegUserLookupTable.c.  You can safely
+ * Full details can be found in kamailioSIPRegUserLookupTable.c.  You can safely
  * ignore the other functions.  
  */
 
-#ifndef OPENSERSIPREGUSERLOOKUPTABLE_H
-#define OPENSERSIPREGUSERLOOKUPTABLE_H
+#ifndef KAMAILIOSIPREGUSERLOOKUPTABLE_H
+#define KAMAILIOSIPREGUSERLOOKUPTABLE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -68,126 +68,126 @@ extern "C" {
 
 
 /* This structure represnts a row in the table */
-typedef struct openserSIPRegUserLookupTable_context_s 
+typedef struct kamailioSIPRegUserLookupTable_context_s 
 {
 	netsnmp_index index; 
 
 	/** UNSIGNED32 = ASN_UNSIGNED */
-	unsigned long  openserSIPRegUserLookupIndex;
+	unsigned long  kamailioSIPRegUserLookupIndex;
 
 	/** SnmpAdminString = ASN_OCTET_STR */
-	unsigned char *openserSIPRegUserLookupURI;
-	long           openserSIPRegUserLookupURI_len;
+	unsigned char *kamailioSIPRegUserLookupURI;
+	long           kamailioSIPRegUserLookupURI_len;
 
 	/** UNSIGNED32 = ASN_UNSIGNED */
-	unsigned long  openserSIPRegUserIndex;
+	unsigned long  kamailioSIPRegUserIndex;
 
 	/** RowStatus = ASN_INTEGER */
-	long openserSIPRegUserLookupRowStatus;
+	long kamailioSIPRegUserLookupRowStatus;
 
 	void * data;
 
-} openserSIPRegUserLookupTable_context;
+} kamailioSIPRegUserLookupTable_context;
 
 /*
- * Initializes the openserSIPRegUserLookupTable table.  This step is easier
+ * Initializes the kamailioSIPRegUserLookupTable table.  This step is easier
  * than in the other tables because there is no table population.  All table
  * population takes place during run time. 
  */
-void init_openserSIPRegUserLookupTable(void);
+void init_kamailioSIPRegUserLookupTable(void);
 
 
 /*
- * Initialize the openserSIPRegUserLookupTable table by defining how it is
+ * Initialize the kamailioSIPRegUserLookupTable table by defining how it is
  * structured. 
  *
  * This function is mostly auto-generated.
  */
-void initialize_table_openserSIPRegUserLookupTable(void);
+void initialize_table_kamailioSIPRegUserLookupTable(void);
 
 /* 
  * This function was auto-generated and didn't need modifications from its
  * auto-generation.  It is called to handle an SNMP GET request. 
  */
-int openserSIPRegUserLookupTable_get_value(netsnmp_request_info *, 
+int kamailioSIPRegUserLookupTable_get_value(netsnmp_request_info *, 
 		netsnmp_index *, netsnmp_table_request_info *);
 
-const openserSIPRegUserLookupTable_context * 
-	openserSIPRegUserLookupTable_get_by_idx(netsnmp_index *);
+const kamailioSIPRegUserLookupTable_context * 
+	kamailioSIPRegUserLookupTable_get_by_idx(netsnmp_index *);
 
-const openserSIPRegUserLookupTable_context * 
-	openserSIPRegUserLookupTable_get_by_idx_rs(
+const kamailioSIPRegUserLookupTable_context * 
+	kamailioSIPRegUserLookupTable_get_by_idx_rs(
 			netsnmp_index *, 
 			int row_status);
 
 /* oid declarations */
-extern oid    openserSIPRegUserLookupTable_oid[];
-extern size_t openserSIPRegUserLookupTable_oid_len;
+extern oid    kamailioSIPRegUserLookupTable_oid[];
+extern size_t kamailioSIPRegUserLookupTable_oid_len;
 
 
-#define openserSIPRegUserLookupTable_TABLE_OID OPENSER_OID,3,1,2,1,5,9
+#define kamailioSIPRegUserLookupTable_TABLE_OID KAMAILIO_OID,3,1,2,1,5,9
 
 
-/* column number definitions for table openserSIPRegUserLookupTable */
-#define COLUMN_OPENSERSIPREGUSERLOOKUPINDEX     1
-#define COLUMN_OPENSERSIPREGUSERLOOKUPURI       2
-#define COLUMN_OPENSERSIPREGUSERINDEX           3
-#define COLUMN_OPENSERSIPREGUSERLOOKUPROWSTATUS 4
+/* column number definitions for table kamailioSIPRegUserLookupTable */
+#define COLUMN_KAMAILIOSIPREGUSERLOOKUPINDEX     1
+#define COLUMN_KAMAILIOSIPREGUSERLOOKUPURI       2
+#define COLUMN_KAMAILIOSIPREGUSERINDEX           3
+#define COLUMN_KAMAILIOSIPREGUSERLOOKUPROWSTATUS 4
 
-#define openserSIPRegUserLookupTable_COL_MIN 2
-#define openserSIPRegUserLookupTable_COL_MAX 4
+#define kamailioSIPRegUserLookupTable_COL_MIN 2
+#define kamailioSIPRegUserLookupTable_COL_MAX 4
 
 
 /* Handles index extraction for row creation */
-int openserSIPRegUserLookupTable_extract_index( 
-		openserSIPRegUserLookupTable_context *ctx, netsnmp_index *hdr);
+int kamailioSIPRegUserLookupTable_extract_index( 
+		kamailioSIPRegUserLookupTable_context *ctx, netsnmp_index *hdr);
 
 /* Handle RESERVE1 and RESERVE2 phases of an SNMP SET */
-void openserSIPRegUserLookupTable_set_reserve1(netsnmp_request_group *);
-void openserSIPRegUserLookupTable_set_reserve2(netsnmp_request_group *);
+void kamailioSIPRegUserLookupTable_set_reserve1(netsnmp_request_group *);
+void kamailioSIPRegUserLookupTable_set_reserve2(netsnmp_request_group *);
 
 /* Handle the SET and ACTION phases of an SNMP SET */
-void openserSIPRegUserLookupTable_set_action(netsnmp_request_group *);
-void openserSIPRegUserLookupTable_set_commit(netsnmp_request_group *);
+void kamailioSIPRegUserLookupTable_set_action(netsnmp_request_group *);
+void kamailioSIPRegUserLookupTable_set_commit(netsnmp_request_group *);
 
 /* Handle Resource cleanup if the ACTION or RESERVE1/RESERVE2 phases of an
  * SNMPSET fail */
-void openserSIPRegUserLookupTable_set_free(netsnmp_request_group *);
-void openserSIPRegUserLookupTable_set_undo(netsnmp_request_group *);
+void kamailioSIPRegUserLookupTable_set_free(netsnmp_request_group *);
+void kamailioSIPRegUserLookupTable_set_undo(netsnmp_request_group *);
 
-openserSIPRegUserLookupTable_context * 
-	openserSIPRegUserLookupTable_duplicate_row(
-			openserSIPRegUserLookupTable_context*);
+kamailioSIPRegUserLookupTable_context * 
+	kamailioSIPRegUserLookupTable_duplicate_row(
+			kamailioSIPRegUserLookupTable_context*);
 
-netsnmp_index * openserSIPRegUserLookupTable_delete_row(
-		openserSIPRegUserLookupTable_context*);
+netsnmp_index * kamailioSIPRegUserLookupTable_delete_row(
+		kamailioSIPRegUserLookupTable_context*);
 
 /* Used to check if there is a reason why a row can't be activated 
  * (There is no reason in our implementation)
  */
-int openserSIPRegUserLookupTable_can_activate(
-		openserSIPRegUserLookupTable_context *undo_ctx,
-		openserSIPRegUserLookupTable_context *row_ctx,
+int kamailioSIPRegUserLookupTable_can_activate(
+		kamailioSIPRegUserLookupTable_context *undo_ctx,
+		kamailioSIPRegUserLookupTable_context *row_ctx,
 		netsnmp_request_group * rg);
 
 /* Used to check if there is a reason why a row can't be deactivated 
  * (There is no reason in our implementation)
  */
-int openserSIPRegUserLookupTable_can_deactivate(
-		openserSIPRegUserLookupTable_context *undo_ctx,
-		openserSIPRegUserLookupTable_context *row_ctx,
+int kamailioSIPRegUserLookupTable_can_deactivate(
+		kamailioSIPRegUserLookupTable_context *undo_ctx,
+		kamailioSIPRegUserLookupTable_context *row_ctx,
 		netsnmp_request_group * rg);
 
 /* Used to check if there is a reason why a row can't be deleted
  * (There is no reason in our implementation)
  */
-int openserSIPRegUserLookupTable_can_delete(
-		openserSIPRegUserLookupTable_context *undo_ctx,
-		openserSIPRegUserLookupTable_context *row_ctx,
+int kamailioSIPRegUserLookupTable_can_delete(
+		kamailioSIPRegUserLookupTable_context *undo_ctx,
+		kamailioSIPRegUserLookupTable_context *row_ctx,
 		netsnmp_request_group * rg);
 	
 /* Basic structural setups of the new row */
-openserSIPRegUserLookupTable_context * openserSIPRegUserLookupTable_create_row(
+kamailioSIPRegUserLookupTable_context * kamailioSIPRegUserLookupTable_create_row(
 		netsnmp_index*);
 
 
@@ -195,4 +195,4 @@ openserSIPRegUserLookupTable_context * openserSIPRegUserLookupTable_create_row(
 }
 #endif
 
-#endif /** OPENSERSIPREGUSERLOOKUPTABLE_H */
+#endif /** KAMAILIOSIPREGUSERLOOKUPTABLE_H */

modules_k/snmpstats/snmpSIPRegUserTable.c

@@ -29,8 +29,8 @@
  * Note: this file originally auto-generated by mib2c using
  * mib2c.array-user.conf
  *
- * This file implements the openserSIPRegUserTable.  For a full description of
- * the table, please see the OPENSER-SIP-SERVER-MIB.
+ * This file implements the kamailioSIPRegUserTable.  For a full description of
+ * the table, please see the KAMAILIO-SIP-SERVER-MIB.
  *
  * Understanding this code will be much simpler with the following information:
  *
@@ -43,8 +43,8 @@
  *    this reason a string indexed Hash Table was created, with each entry mapping
  *    to an integer user index. 
  *
- *    This hash table is used by the openserSIPContactTable (the hash table also
- *    maps a user to its contacts), as well as the openserSIPRegUserLookupTable.
+ *    This hash table is used by the kamailioSIPContactTable (the hash table also
+ *    maps a user to its contacts), as well as the kamailioSIPRegUserLookupTable.
  *    The hash table is also used for quick lookups when a user expires. (i.e, it
  *    gives us a more direct reference, instead of having to search the whole
  *    table).
@@ -70,7 +70,7 @@
  *
  *    This doesn't remove the NetSNMP inefficiency, but instead moves it to a
  *    non-critical path.  Such an approach allows SNMP support with almost no
- *    overhead to the rest of OpenSER.
+ *    overhead to the rest of Kamailio.
  */
 
 #include <net-snmp/net-snmp-config.h>
@@ -92,8 +92,8 @@
 static netsnmp_handler_registration *my_handler = NULL;
 static netsnmp_table_array_callbacks cb;
 
-oid    openserSIPRegUserTable_oid[]   = { openserSIPRegUserTable_TABLE_OID };
-size_t openserSIPRegUserTable_oid_len = OID_LENGTH(openserSIPRegUserTable_oid);
+oid    kamailioSIPRegUserTable_oid[]   = { kamailioSIPRegUserTable_TABLE_OID };
+size_t kamailioSIPRegUserTable_oid_len = OID_LENGTH(kamailioSIPRegUserTable_oid);
 
 
 /* If the usrloc module is loaded, this function will grab hooks into its
@@ -126,7 +126,7 @@ int registerForUSRLOCCallbacks(void)
 
 error:
 	LM_INFO("failed to register for callbacks with the USRLOC module.");
-	LM_INFO("openserSIPContactTable and openserSIPUserTable will be"
+	LM_INFO("kamailioSIPContactTable and kamailioSIPUserTable will be"
 			" unavailable");
 	return 0;
 }
@@ -137,7 +137,7 @@ error:
 void deleteRegUserRow(int userIndex) 
 {
 	
-	openserSIPRegUserTable_context *theRow;
+	kamailioSIPRegUserTable_context *theRow;
 
 	netsnmp_index indexToRemove;
 	oid indexToRemoveOID;
@@ -153,7 +153,7 @@ void deleteRegUserRow(int userIndex)
 	 * malloc() */
 	if (theRow != NULL) {
 		CONTAINER_REMOVE(cb.container, &indexToRemove);
-		pkg_free(theRow->openserSIPUserUri);
+		pkg_free(theRow->kamailioSIPUserUri);
 		pkg_free(theRow->index.oids);
 		free(theRow);
 	}
@@ -191,7 +191,7 @@ void updateUser(char *userName)
 
 	if (userIndex == 0) 
 	{
-		LM_ERR("openserSIPRegUserTable ran out of memory."
+		LM_ERR("kamailioSIPRegUserTable ran out of memory."
 				"  Not able to add user: %s", userName);
 		return;
 	}
@@ -203,7 +203,7 @@ void updateUser(char *userName)
 	 * table and fail. */
 	if (newRecord == NULL) {
 		deleteRegUserRow(userIndex);
-		LM_ERR("openserSIPRegUserTable was not able to push %s into the hash."
+		LM_ERR("kamailioSIPRegUserTable was not able to push %s into the hash."
 				"  User not added to this table\n", userName);
 		return;
 	}
@@ -229,15 +229,15 @@ int createRegUserRow(char *stringToRegister)
 	
 	index++;
 
-	openserSIPRegUserTable_context *theRow;
+	kamailioSIPRegUserTable_context *theRow;
 
 	oid  *OIDIndex;
 	int  stringLength;
 
-	theRow = SNMP_MALLOC_TYPEDEF(openserSIPRegUserTable_context);
+	theRow = SNMP_MALLOC_TYPEDEF(kamailioSIPRegUserTable_context);
 
 	if (theRow == NULL) {
-		LM_ERR("failed to create a row for openserSIPRegUserTable\n");
+		LM_ERR("failed to create a row for kamailioSIPRegUserTable\n");
 		return 0;
 	}
 
@@ -245,7 +245,7 @@ int createRegUserRow(char *stringToRegister)
 
 	if (OIDIndex == NULL) {
 		free(theRow);
-		LM_ERR("failed to create a row for openserSIPRegUserTable\n");
+		LM_ERR("failed to create a row for kamailioSIPRegUserTable\n");
 		return 0;
 	}
 
@@ -255,33 +255,33 @@ int createRegUserRow(char *stringToRegister)
 
 	theRow->index.len  = 1;
 	theRow->index.oids = OIDIndex;
-	theRow->openserSIPUserIndex = index;
+	theRow->kamailioSIPUserIndex = index;
 
-	theRow->openserSIPUserUri     = (unsigned char*)pkg_malloc(stringLength* sizeof(char));
-    if(theRow->openserSIPUserUri== NULL)
+	theRow->kamailioSIPUserUri     = (unsigned char*)pkg_malloc(stringLength* sizeof(char));
+    if(theRow->kamailioSIPUserUri== NULL)
     {
         pkg_free(OIDIndex);
 		free(theRow);
-		LM_ERR("failed to create a row for openserSIPRegUserTable\n");
+		LM_ERR("failed to create a row for kamailioSIPRegUserTable\n");
 		return 0;
 
     }
-    memcpy(theRow->openserSIPUserUri, stringToRegister, stringLength);
+    memcpy(theRow->kamailioSIPUserUri, stringToRegister, stringLength);
 	
-    theRow->openserSIPUserUri_len = stringLength;
+    theRow->kamailioSIPUserUri_len = stringLength;
 
-	theRow->openserSIPUserAuthenticationFailures = 0;
+	theRow->kamailioSIPUserAuthenticationFailures = 0;
 
 	CONTAINER_INSERT(cb.container, theRow);
 
 	return index;
 }
 
-/* Initializes the openserSIPRegUserTable module.  */
-void init_openserSIPRegUserTable(void)
+/* Initializes the kamailioSIPRegUserTable module.  */
+void init_kamailioSIPRegUserTable(void)
 {
 	/* Register this table with the master agent */
-	initialize_table_openserSIPRegUserTable();
+	initialize_table_kamailioSIPRegUserTable();
 
 	/* We need to create a default row, so create DefaultUser */
 	static char *defaultUser = "DefaultUser";
@@ -292,15 +292,15 @@ void init_openserSIPRegUserTable(void)
 
 
 /*
- * Initialize the openserSIPRegUserTable table by defining its contents and how
+ * Initialize the kamailioSIPRegUserTable table by defining its contents and how
  * it's structured
  */
-void initialize_table_openserSIPRegUserTable(void)
+void initialize_table_kamailioSIPRegUserTable(void)
 {
 	netsnmp_table_registration_info *table_info;
 
 	if(my_handler) {
-		snmp_log(LOG_ERR, "initialize_table_openserSIPRegUserTable_hand"
+		snmp_log(LOG_ERR, "initialize_table_kamailioSIPRegUserTable_hand"
 				"ler called again\n");
 		return;
 	}
@@ -312,29 +312,29 @@ void initialize_table_openserSIPRegUserTable(void)
 
 	my_handler = 
 		netsnmp_create_handler_registration(
-			"openserSIPRegUserTable",
+			"kamailioSIPRegUserTable",
 			netsnmp_table_array_helper_handler, 
-			openserSIPRegUserTable_oid,
-			openserSIPRegUserTable_oid_len,
+			kamailioSIPRegUserTable_oid,
+			kamailioSIPRegUserTable_oid_len,
 			HANDLER_CAN_RONLY);
 
 	if (!my_handler || !table_info) {
-		snmp_log(LOG_ERR, "malloc failed in initialize_table_openser"
+		snmp_log(LOG_ERR, "malloc failed in initialize_table_kamailio"
 				"SIPRegUserTable_handler\n");
 		return; /** mallocs failed */
 	}
 
 	netsnmp_table_helper_add_index(table_info, ASN_UNSIGNED);
 
-	table_info->min_column = openserSIPRegUserTable_COL_MIN;
-	table_info->max_column = openserSIPRegUserTable_COL_MAX;
+	table_info->min_column = kamailioSIPRegUserTable_COL_MIN;
+	table_info->max_column = kamailioSIPRegUserTable_COL_MAX;
 
-	cb.get_value = openserSIPRegUserTable_get_value;
-	cb.container = netsnmp_container_find("openserSIPRegUserTable_primary:"
-			"openserSIPRegUserTable:" "table_container");
+	cb.get_value = kamailioSIPRegUserTable_get_value;
+	cb.container = netsnmp_container_find("kamailioSIPRegUserTable_primary:"
+			"kamailioSIPRegUserTable:" "table_container");
 
-	DEBUGMSGTL(("initialize_table_openserSIPRegUserTable",
-				"Registering table openserSIPRegUserTable "
+	DEBUGMSGTL(("initialize_table_kamailioSIPRegUserTable",
+				"Registering table kamailioSIPRegUserTable "
 				"as a table array\n"));
 
 	netsnmp_table_container_register(my_handler, table_info, &cb, 
@@ -343,7 +343,7 @@ void initialize_table_openserSIPRegUserTable(void)
 
 
 /* Handles SNMP GET requests. */
-int openserSIPRegUserTable_get_value(
+int kamailioSIPRegUserTable_get_value(
 		netsnmp_request_info *request,
 		netsnmp_index *item,
 		netsnmp_table_request_info *table_info )
@@ -354,31 +354,31 @@ int openserSIPRegUserTable_get_value(
 
 	netsnmp_variable_list *var = request->requestvb;
 
-	openserSIPRegUserTable_context *context = 
-		(openserSIPRegUserTable_context *)item;
+	kamailioSIPRegUserTable_context *context = 
+		(kamailioSIPRegUserTable_context *)item;
 
 	switch(table_info->colnum) 
 	{
 
-		case COLUMN_OPENSERSIPUSERURI:
+		case COLUMN_KAMAILIOSIPUSERURI:
 			/** SnmpAdminString = ASN_OCTET_STR */
 			snmp_set_var_typed_value(var, ASN_OCTET_STR,
-				(unsigned char*)context->openserSIPUserUri,
-				context->openserSIPUserUri_len );
+				(unsigned char*)context->kamailioSIPUserUri,
+				context->kamailioSIPUserUri_len );
 			break;
 	
-		case COLUMN_OPENSERSIPUSERAUTHENTICATIONFAILURES:
+		case COLUMN_KAMAILIOSIPUSERAUTHENTICATIONFAILURES:
 			/** COUNTER = ASN_COUNTER */
 			snmp_set_var_typed_value(var, ASN_COUNTER,
 				(unsigned char*)
-				&context->openserSIPUserAuthenticationFailures,
+				&context->kamailioSIPUserAuthenticationFailures,
 				sizeof(
-				context->openserSIPUserAuthenticationFailures));
+				context->kamailioSIPUserAuthenticationFailures));
 		break;
 	
 		default: /** We shouldn't get here */
 			snmp_log(LOG_ERR, "unknown column in "
-				"openserSIPRegUserTable_get_value\n");
+				"kamailioSIPRegUserTable_get_value\n");
 
 			return SNMP_ERR_GENERR;
 	}
@@ -387,10 +387,10 @@ int openserSIPRegUserTable_get_value(
 }
 
 
-const openserSIPRegUserTable_context *
-openserSIPRegUserTable_get_by_idx(netsnmp_index * hdr)
+const kamailioSIPRegUserTable_context *
+kamailioSIPRegUserTable_get_by_idx(netsnmp_index * hdr)
 {
-	return (const openserSIPRegUserTable_context *)
+	return (const kamailioSIPRegUserTable_context *)
 		CONTAINER_FIND(cb.container, hdr );
 }
 

modules_k/snmpstats/snmpSIPRegUserTable.h

@@ -26,13 +26,13 @@
  * --------
  * 2006-11-23 initial version (jmagder)
  * 2007-02-16 Moved all OID registrations from the experimental branch to 
- *            OpenSER's IANA assigned enterprise branch. (jmagder)
+ *            Kamailio's IANA assigned enterprise branch. (jmagder)
  * 
  * Note: this file originally auto-generated by mib2c using
  * mib2c.array-user.conf
  *
- * This file defines the prototypes that implement the openserSIPRegUserTable.
- * For a full description of the table, please see the OPENSER-SIP-SERVER-MIB.
+ * This file defines the prototypes that implement the kamailioSIPRegUserTable.
+ * For a full description of the table, please see the KAMAILIO-SIP-SERVER-MIB.
  *
  * Understanding this code will be much simpler with the following information:
  *
@@ -45,8 +45,8 @@
  *    this reason a string indexed Hash Table was created, with each entry mapping
  *    to an integer user index. 
  *
- *    This hash table is used by the openserSIPContactTable (the hash table also
- *    maps a user to its contacts), as well as the openserSIPRegUserLookupTable.
+ *    This hash table is used by the kamailioSIPContactTable (the hash table also
+ *    maps a user to its contacts), as well as the kamailioSIPRegUserLookupTable.
  *    The hash table is also used for quick lookups when a user expires. (i.e, it
  *    gives us a more direct reference, instead of having to search the whole
  *    table).
@@ -72,11 +72,11 @@
  *
  *    This doesn't remove the NetSNMP inefficiency, but instead moves it to a
  *    non-critical path.  Such an approach allows SNMP support with almost no
- *    overhead to the rest of OpenSER.
+ *    overhead to the rest of Kamailio.
  */
 
-#ifndef OPENSERSIPREGUSERTABLE_H
-#define OPENSERSIPREGUSERTABLE_H
+#ifndef KAMAILIOSIPREGUSERTABLE_H
+#define KAMAILIOSIPREGUSERTABLE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -89,24 +89,24 @@ extern "C" {
 #include "../../config.h"
 
 /* Defines what each SNMP Row is made of. */
-typedef struct openserSIPRegUserTable_context_s 
+typedef struct kamailioSIPRegUserTable_context_s 
 {
 	netsnmp_index index; 
 
-	unsigned long openserSIPUserIndex;
+	unsigned long kamailioSIPUserIndex;
 
 	/* There are potentially a lot of these of varying sizes, so lets
 	 * allocate only the amount of memory we need when the row is
 	 * created. */
-	unsigned char *openserSIPUserUri;
+	unsigned char *kamailioSIPUserUri;
 
-	long openserSIPUserUri_len;
+	long kamailioSIPUserUri_len;
 
-	unsigned long openserSIPUserAuthenticationFailures;
+	unsigned long kamailioSIPUserAuthenticationFailures;
 
 	void * data;
 
-} openserSIPRegUserTable_context;
+} kamailioSIPRegUserTable_context;
 
 /*******************************/
 /*    Customized Prototypes    */
@@ -149,43 +149,43 @@ void updateUser(char *userName);
 /* Normal Function Prototypes  */
 /*******************************/
 
-/* Initializes the openserSIPRegUserTable module.  */
-void  init_openserSIPRegUserTable(void);
+/* Initializes the kamailioSIPRegUserTable module.  */
+void  init_kamailioSIPRegUserTable(void);
 
 /*
- * Initialize the openserSIPRegUserTable table by defining its contents and how
+ * Initialize the kamailioSIPRegUserTable table by defining its contents and how
  * it's structured
  */
-void  initialize_table_openserSIPRegUserTable(void);
+void  initialize_table_kamailioSIPRegUserTable(void);
 
-const openserSIPRegUserTable_context * openserSIPRegUserTable_get_by_idx(
+const kamailioSIPRegUserTable_context * kamailioSIPRegUserTable_get_by_idx(
 		netsnmp_index *);
 
-const openserSIPRegUserTable_context * openserSIPRegUserTable_get_by_idx_rs(
+const kamailioSIPRegUserTable_context * kamailioSIPRegUserTable_get_by_idx_rs(
 		netsnmp_index *, int row_status);
 
 /* Handles SNMP GET requests. */
-int   openserSIPRegUserTable_get_value(
+int   kamailioSIPRegUserTable_get_value(
 		netsnmp_request_info *, 
 		netsnmp_index *, 
 		netsnmp_table_request_info *);
 
 /* OID Declarations. */
-extern oid openserSIPRegUserTable_oid[];
-extern size_t openserSIPRegUserTable_oid_len;
+extern oid kamailioSIPRegUserTable_oid[];
+extern size_t kamailioSIPRegUserTable_oid_len;
 
-#define openserSIPRegUserTable_TABLE_OID OPENSER_OID,3,1,2,1,5,6
+#define kamailioSIPRegUserTable_TABLE_OID KAMAILIO_OID,3,1,2,1,5,6
     
 /* Column Definitions */
-#define COLUMN_OPENSERSIPUSERINDEX                  1
-#define COLUMN_OPENSERSIPUSERURI                    2
-#define COLUMN_OPENSERSIPUSERAUTHENTICATIONFAILURES 3
+#define COLUMN_KAMAILIOSIPUSERINDEX                  1
+#define COLUMN_KAMAILIOSIPUSERURI                    2
+#define COLUMN_KAMAILIOSIPUSERAUTHENTICATIONFAILURES 3
 
-#define openserSIPRegUserTable_COL_MIN 2
-#define openserSIPRegUserTable_COL_MAX 3
+#define kamailioSIPRegUserTable_COL_MIN 2
+#define kamailioSIPRegUserTable_COL_MAX 3
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /** OPENSERSIPREGUSERTABLE_H */
+#endif /** KAMAILIOSIPREGUSERTABLE_H */

modules_k/snmpstats/snmpSIPServerObjects.c

@@ -26,13 +26,13 @@
  * --------
  * 2006-11-23 initial version (jmagder)
  * 2007-02-16 Moved all OID registrations from the experimental branch to 
- *            OpenSER's IANA assigned enterprise branch. (jmagder)
+ *            Kamailio's IANA assigned enterprise branch. (jmagder)
  * 
  * Note: this file originally auto-generated by mib2c using
  *        : mib2c.scalar.conf,v 1.9 2005/01/07 09:37:18 dts12 Exp $
  *
- * This file implements all scalares defines in the OPENSER-SIP-SERVER-MIB.  For
- * a full description of the scalars, please see OPENSER-SIP-SERVER-MIB.
+ * This file implements all scalares defines in the KAMAILIO-SIP-SERVER-MIB.  For
+ * a full description of the scalars, please see KAMAILIO-SIP-SERVER-MIB.
  *
  */
 
@@ -51,145 +51,145 @@
 #include "snmpstats_globals.h"
 #include "utilities.h"
 
-/* Used for openserSIPRegUserLookupCounter.  (See the MIB file for details) */
+/* Used for kamailioSIPRegUserLookupCounter.  (See the MIB file for details) */
 unsigned int global_UserLookupCounter;
 
 
-/* Initializes the openserSIPServerObjects module.  This involves: 
+/* Initializes the kamailioSIPServerObjects module.  This involves: 
  *
  *  - Registering all OID's
  *  - Setting up handlers for all OID's
  *
  * This function is mostly auto-generated. */
-void init_openserSIPServerObjects(void)
+void init_kamailioSIPServerObjects(void)
 {
-	static oid openserSIPProxyStatefulness_oid[]  =
-		{ OPENSER_OID,3,1,2,1,3,1 };
+	static oid kamailioSIPProxyStatefulness_oid[]  =
+		{ KAMAILIO_OID,3,1,2,1,3,1 };
 
-	static oid openserSIPProxyRecordRoute_oid[]   =
-		{ OPENSER_OID,3,1,2,1,3,3 };
+	static oid kamailioSIPProxyRecordRoute_oid[]   =
+		{ KAMAILIO_OID,3,1,2,1,3,3 };
 
-	static oid openserSIPProxyAuthMethod_oid[]    =
-		{ OPENSER_OID,3,1,2,1,3,4 };
+	static oid kamailioSIPProxyAuthMethod_oid[]    =
+		{ KAMAILIO_OID,3,1,2,1,3,4 };
 
-	static oid openserSIPNumProxyRequireFailures_oid[]     =
-		{ OPENSER_OID,3,1,2,1,4,1 };
+	static oid kamailioSIPNumProxyRequireFailures_oid[]     =
+		{ KAMAILIO_OID,3,1,2,1,4,1 };
 
-	static oid openserSIPRegMaxContactExpiryDuration_oid[] =
-		{ OPENSER_OID,3,1,2,1,5,2 };
+	static oid kamailioSIPRegMaxContactExpiryDuration_oid[] =
+		{ KAMAILIO_OID,3,1,2,1,5,2 };
 
-	static oid openserSIPRegMaxUsers_oid[]              =
-		{ OPENSER_OID,3,1,2,1,5,3 };
+	static oid kamailioSIPRegMaxUsers_oid[]              =
+		{ KAMAILIO_OID,3,1,2,1,5,3 };
 
-	static oid openserSIPRegCurrentUsers_oid[]          =
-		{ OPENSER_OID,3,1,2,1,5,4 };
+	static oid kamailioSIPRegCurrentUsers_oid[]          =
+		{ KAMAILIO_OID,3,1,2,1,5,4 };
 
-	static oid openserSIPRegDfltRegActiveInterval_oid[] =
-		{ OPENSER_OID,3,1,2,1,5,5 };
+	static oid kamailioSIPRegDfltRegActiveInterval_oid[] =
+		{ KAMAILIO_OID,3,1,2,1,5,5 };
 
-	static oid openserSIPRegUserLookupCounter_oid[]     =
-		{ OPENSER_OID,3,1,2,1,5,8 };
+	static oid kamailioSIPRegUserLookupCounter_oid[]     =
+		{ KAMAILIO_OID,3,1,2,1,5,8 };
 
-	static oid openserSIPRegAcceptedRegistrations_oid[] =
-		{ OPENSER_OID,3,1,2,1,6,1 };
+	static oid kamailioSIPRegAcceptedRegistrations_oid[] =
+		{ KAMAILIO_OID,3,1,2,1,6,1 };
 
-	static oid openserSIPRegRejectedRegistrations_oid[] =
-		{ OPENSER_OID,3,1,2,1,6,2 };
+	static oid kamailioSIPRegRejectedRegistrations_oid[] =
+		{ KAMAILIO_OID,3,1,2,1,6,2 };
 
-	DEBUGMSGTL(("openserSIPServerObjects", "Initializing\n"));
+	DEBUGMSGTL(("kamailioSIPServerObjects", "Initializing\n"));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPProxyStatefulness",
-			handle_openserSIPProxyStatefulness,
-			openserSIPProxyStatefulness_oid,
-			OID_LENGTH(openserSIPProxyStatefulness_oid),
+			"kamailioSIPProxyStatefulness",
+			handle_kamailioSIPProxyStatefulness,
+			kamailioSIPProxyStatefulness_oid,
+			OID_LENGTH(kamailioSIPProxyStatefulness_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPProxyRecordRoute",
-			handle_openserSIPProxyRecordRoute,
-			openserSIPProxyRecordRoute_oid,
-			OID_LENGTH(openserSIPProxyRecordRoute_oid),
+			"kamailioSIPProxyRecordRoute",
+			handle_kamailioSIPProxyRecordRoute,
+			kamailioSIPProxyRecordRoute_oid,
+			OID_LENGTH(kamailioSIPProxyRecordRoute_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPProxyAuthMethod",
-			handle_openserSIPProxyAuthMethod,
-			openserSIPProxyAuthMethod_oid,
-			OID_LENGTH(openserSIPProxyAuthMethod_oid),
+			"kamailioSIPProxyAuthMethod",
+			handle_kamailioSIPProxyAuthMethod,
+			kamailioSIPProxyAuthMethod_oid,
+			OID_LENGTH(kamailioSIPProxyAuthMethod_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPNumProxyRequireFailures",
-			handle_openserSIPNumProxyRequireFailures,
-			openserSIPNumProxyRequireFailures_oid,
-			OID_LENGTH(openserSIPNumProxyRequireFailures_oid),
+			"kamailioSIPNumProxyRequireFailures",
+			handle_kamailioSIPNumProxyRequireFailures,
+			kamailioSIPNumProxyRequireFailures_oid,
+			OID_LENGTH(kamailioSIPNumProxyRequireFailures_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPRegMaxContactExpiryDuration",
-			handle_openserSIPRegMaxContactExpiryDuration,
-			openserSIPRegMaxContactExpiryDuration_oid,
-			OID_LENGTH(openserSIPRegMaxContactExpiryDuration_oid),
+			"kamailioSIPRegMaxContactExpiryDuration",
+			handle_kamailioSIPRegMaxContactExpiryDuration,
+			kamailioSIPRegMaxContactExpiryDuration_oid,
+			OID_LENGTH(kamailioSIPRegMaxContactExpiryDuration_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPRegMaxUsers",
-			handle_openserSIPRegMaxUsers,
-			openserSIPRegMaxUsers_oid,
-			OID_LENGTH(openserSIPRegMaxUsers_oid),
+			"kamailioSIPRegMaxUsers",
+			handle_kamailioSIPRegMaxUsers,
+			kamailioSIPRegMaxUsers_oid,
+			OID_LENGTH(kamailioSIPRegMaxUsers_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPRegCurrentUsers",
-			handle_openserSIPRegCurrentUsers,
-			openserSIPRegCurrentUsers_oid,
-			OID_LENGTH(openserSIPRegCurrentUsers_oid),
+			"kamailioSIPRegCurrentUsers",
+			handle_kamailioSIPRegCurrentUsers,
+			kamailioSIPRegCurrentUsers_oid,
+			OID_LENGTH(kamailioSIPRegCurrentUsers_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPRegDfltRegActiveInterval",
-			handle_openserSIPRegDfltRegActiveInterval,
-			openserSIPRegDfltRegActiveInterval_oid,
-			OID_LENGTH(openserSIPRegDfltRegActiveInterval_oid),
+			"kamailioSIPRegDfltRegActiveInterval",
+			handle_kamailioSIPRegDfltRegActiveInterval,
+			kamailioSIPRegDfltRegActiveInterval_oid,
+			OID_LENGTH(kamailioSIPRegDfltRegActiveInterval_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPRegUserLookupCounter",
-			handle_openserSIPRegUserLookupCounter,
-			openserSIPRegUserLookupCounter_oid,
-			OID_LENGTH(openserSIPRegUserLookupCounter_oid),
+			"kamailioSIPRegUserLookupCounter",
+			handle_kamailioSIPRegUserLookupCounter,
+			kamailioSIPRegUserLookupCounter_oid,
+			OID_LENGTH(kamailioSIPRegUserLookupCounter_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPRegAcceptedRegistrations",
-			handle_openserSIPRegAcceptedRegistrations,
-			openserSIPRegAcceptedRegistrations_oid,
-			OID_LENGTH(openserSIPRegAcceptedRegistrations_oid),
+			"kamailioSIPRegAcceptedRegistrations",
+			handle_kamailioSIPRegAcceptedRegistrations,
+			kamailioSIPRegAcceptedRegistrations_oid,
+			OID_LENGTH(kamailioSIPRegAcceptedRegistrations_oid),
 			HANDLER_CAN_RONLY));
 
 	netsnmp_register_scalar(
 		netsnmp_create_handler_registration(
-			"openserSIPRegRejectedRegistrations",
-			handle_openserSIPRegRejectedRegistrations,
-			openserSIPRegRejectedRegistrations_oid,
-			OID_LENGTH(openserSIPRegRejectedRegistrations_oid),
+			"kamailioSIPRegRejectedRegistrations",
+			handle_kamailioSIPRegRejectedRegistrations,
+			kamailioSIPRegRejectedRegistrations_oid,
+			OID_LENGTH(kamailioSIPRegRejectedRegistrations_oid),
 			HANDLER_CAN_RONLY));
 }
 
-/* The following are handlers for the scalars in the OPENSER-SIP-SERVER-MIB. */
+/* The following are handlers for the scalars in the KAMAILIO-SIP-SERVER-MIB. */
 
-int handle_openserSIPProxyStatefulness(netsnmp_mib_handler *handler,
+int handle_kamailioSIPProxyStatefulness(netsnmp_mib_handler *handler,
 	netsnmp_handler_registration *reginfo,
 	netsnmp_agent_request_info   *reqinfo,
 	netsnmp_request_info         *requests)
@@ -219,7 +219,7 @@ int handle_openserSIPProxyStatefulness(netsnmp_mib_handler *handler,
 }
 
 
-int handle_openserSIPProxyRecordRoute(netsnmp_mib_handler *handler,
+int handle_kamailioSIPProxyRecordRoute(netsnmp_mib_handler *handler,
 	netsnmp_handler_registration *reginfo,
 	netsnmp_agent_request_info   *reqinfo,
 	netsnmp_request_info         *requests)
@@ -242,7 +242,7 @@ int handle_openserSIPProxyRecordRoute(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserSIPProxyAuthMethod(netsnmp_mib_handler *handler,
+int handle_kamailioSIPProxyAuthMethod(netsnmp_mib_handler *handler,
 	netsnmp_handler_registration *reginfo,
 	netsnmp_agent_request_info   *reqinfo,
 	netsnmp_request_info         *requests)
@@ -272,7 +272,7 @@ int handle_openserSIPProxyAuthMethod(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserSIPNumProxyRequireFailures(netsnmp_mib_handler *handler,
+int handle_kamailioSIPNumProxyRequireFailures(netsnmp_mib_handler *handler,
 	netsnmp_handler_registration *reginfo,
 	netsnmp_agent_request_info   *reqinfo,
 	netsnmp_request_info         *requests)
@@ -288,7 +288,7 @@ int handle_openserSIPNumProxyRequireFailures(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserSIPRegMaxContactExpiryDuration(netsnmp_mib_handler *handler,
+int handle_kamailioSIPRegMaxContactExpiryDuration(netsnmp_mib_handler *handler,
 	netsnmp_handler_registration *reginfo,
 	netsnmp_agent_request_info   *reqinfo,
 	netsnmp_request_info         *requests)
@@ -304,13 +304,13 @@ int handle_openserSIPRegMaxContactExpiryDuration(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserSIPRegMaxUsers(netsnmp_mib_handler *handler,
+int handle_kamailioSIPRegMaxUsers(netsnmp_mib_handler *handler,
 	netsnmp_handler_registration *reginfo,
 	netsnmp_agent_request_info   *reqinfo,
 	netsnmp_request_info         *requests)
 {
 
-	/* OpenSER doesn't currently have a parameterized maximum number of
+	/* Kamailio doesn't currently have a parameterized maximum number of
 	 * users.  So we return the maximum value an unsigned32 SNMP datatype
 	 * can hold.  */
 	unsigned int result = 0xffffffff; 
@@ -324,7 +324,7 @@ int handle_openserSIPRegMaxUsers(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserSIPRegCurrentUsers(netsnmp_mib_handler *handler,
+int handle_kamailioSIPRegCurrentUsers(netsnmp_mib_handler *handler,
 	netsnmp_handler_registration *reginfo,
 	netsnmp_agent_request_info   *reqinfo,
 	netsnmp_request_info         *requests)
@@ -342,7 +342,7 @@ int handle_openserSIPRegCurrentUsers(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserSIPRegDfltRegActiveInterval(netsnmp_mib_handler *handler,
+int handle_kamailioSIPRegDfltRegActiveInterval(netsnmp_mib_handler *handler,
 	netsnmp_handler_registration *reginfo,
 	netsnmp_agent_request_info   *reqinfo,
 	netsnmp_request_info         *requests)
@@ -359,7 +359,7 @@ int handle_openserSIPRegDfltRegActiveInterval(netsnmp_mib_handler *handler,
 }
 
 
-int handle_openserSIPRegUserLookupCounter(netsnmp_mib_handler *handler,
+int handle_kamailioSIPRegUserLookupCounter(netsnmp_mib_handler *handler,
 	netsnmp_handler_registration *reginfo,
 	netsnmp_agent_request_info   *reqinfo,
 	netsnmp_request_info         *requests)
@@ -369,7 +369,7 @@ int handle_openserSIPRegUserLookupCounter(netsnmp_mib_handler *handler,
 	/* If we have had so many requests that we've hit our maximum index,
 	 * then we reset our counter back to 1.  For this not to cause problems,
 	 * it will be required that old rows belonging to the table 
-	 * openserSIPRegUserLookupTable are eventually deleted. */
+	 * kamailioSIPRegUserLookupTable are eventually deleted. */
 	if (global_UserLookupCounter > MAX_USER_LOOKUP_COUNTER) {
 		global_UserLookupCounter = 1;
 	}
@@ -383,7 +383,7 @@ int handle_openserSIPRegUserLookupCounter(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserSIPRegAcceptedRegistrations(netsnmp_mib_handler *handler,
+int handle_kamailioSIPRegAcceptedRegistrations(netsnmp_mib_handler *handler,
 	netsnmp_handler_registration *reginfo,
 	netsnmp_agent_request_info   *reqinfo,
 	netsnmp_request_info         *requests)
@@ -399,7 +399,7 @@ int handle_openserSIPRegAcceptedRegistrations(netsnmp_mib_handler *handler,
 	return SNMP_ERR_GENERR;
 }
 
-int handle_openserSIPRegRejectedRegistrations(netsnmp_mib_handler *handler,
+int handle_kamailioSIPRegRejectedRegistrations(netsnmp_mib_handler *handler,
 	netsnmp_handler_registration *reginfo,
 	netsnmp_agent_request_info   *reqinfo,
 	netsnmp_request_info         *requests)

modules_k/snmpstats/snmpSIPServerObjects.h

@@ -29,26 +29,26 @@
  * Note: this file originally auto-generated by mib2c using
  *        : mib2c.scalar.conf,v 1.9 2005/01/07 09:37:18 dts12 Exp $
  *
- * This file implements all scalars defined in the OPENSER-SIP-SERVER-MIB.  
- * For a full description of the scalars, please see OPENSER-SIP-SERVER-MIB.
+ * This file implements all scalars defined in the KAMAILIO-SIP-SERVER-MIB.  
+ * For a full description of the scalars, please see KAMAILIO-SIP-SERVER-MIB.
  *
  */
-#ifndef OPENSERSIPSERVEROBJECTS_H
-#define OPENSERSIPSERVEROBJECTS_H
+#ifndef KAMAILIOSIPSERVEROBJECTS_H
+#define KAMAILIOSIPSERVEROBJECTS_H
 
 /* function declarations */
-void init_openserSIPServerObjects(void);
-Netsnmp_Node_Handler handle_openserSIPProxyStatefulness;
-Netsnmp_Node_Handler handle_openserSIPProxyRecordRoute;
-Netsnmp_Node_Handler handle_openserSIPProxyAuthMethod;
-Netsnmp_Node_Handler handle_openserSIPNumProxyRequireFailures;
-Netsnmp_Node_Handler handle_openserSIPRegMaxContactExpiryDuration;
-Netsnmp_Node_Handler handle_openserSIPRegMaxUsers;
-Netsnmp_Node_Handler handle_openserSIPRegCurrentUsers;
-Netsnmp_Node_Handler handle_openserSIPRegDfltRegActiveInterval;
-Netsnmp_Node_Handler handle_openserSIPRegUserLookupCounter;
-Netsnmp_Node_Handler handle_openserSIPRegAcceptedRegistrations;
-Netsnmp_Node_Handler handle_openserSIPRegRejectedRegistrations;
+void init_kamailioSIPServerObjects(void);
+Netsnmp_Node_Handler handle_kamailioSIPProxyStatefulness;
+Netsnmp_Node_Handler handle_kamailioSIPProxyRecordRoute;
+Netsnmp_Node_Handler handle_kamailioSIPProxyAuthMethod;
+Netsnmp_Node_Handler handle_kamailioSIPNumProxyRequireFailures;
+Netsnmp_Node_Handler handle_kamailioSIPRegMaxContactExpiryDuration;
+Netsnmp_Node_Handler handle_kamailioSIPRegMaxUsers;
+Netsnmp_Node_Handler handle_kamailioSIPRegCurrentUsers;
+Netsnmp_Node_Handler handle_kamailioSIPRegDfltRegActiveInterval;
+Netsnmp_Node_Handler handle_kamailioSIPRegUserLookupCounter;
+Netsnmp_Node_Handler handle_kamailioSIPRegAcceptedRegistrations;
+Netsnmp_Node_Handler handle_kamailioSIPRegRejectedRegistrations;
 
 #define PROXY_STATEFULNESS_STATELESS            1
 #define PROXY_STATEFULNESS_TRANSACTION_STATEFUL 2
@@ -58,4 +58,4 @@ Netsnmp_Node_Handler handle_openserSIPRegRejectedRegistrations;
 #define SIP_AUTH_METHOD_TLS    (128 >> 1)
 #define SIP_AUTH_METHOD_DIGEST (128 >> 2)
 
-#endif /* OPENSERSIPSERVEROBJECTS_H */
+#endif /* KAMAILIOSIPSERVEROBJECTS_H */

modules_k/snmpstats/snmpSIPStatusCodesTable.c

@@ -29,8 +29,8 @@
  * Note: this file originally auto-generated by mib2c using
  * mib2c.array-user.conf
  *
- * The file implements the openserSIPStatusCodesTable.  For a full description
- * of the table, please see the OPENSER-SIP-COMMON-MIB.
+ * The file implements the kamailioSIPStatusCodesTable.  For a full description
+ * of the table, please see the KAMAILIO-SIP-COMMON-MIB.
  * 
  * This file is much larger and more complicated than the files for other
  * tables.  This is because the table is settable, bringing a lot of SNMP
@@ -40,23 +40,23 @@
  * The functions that have been modified to implement this table are the
  * following:
  *
- * 1) openserSIPStatusCodesTable_create_row()
+ * 1) kamailioSIPStatusCodesTable_create_row()
  *
  *    - The row structure has been modified from its default to store the
  *      number of messages that have been recieved and sent with a certain
  *      status code, at the time this row was created.  This function 
  *      populates that data. 
  *
- * 2) openserSIPStatusCodesTable_extract_index() 
+ * 2) kamailioSIPStatusCodesTable_extract_index() 
  *
  *    - Modified to fail if the index is invalid.  The index is invalid if it
  *      does not match up with the global userLookupCounter.
  *
- * 3) openserSIPStatusCodesTable_can_[activate|deactivate|delete]()
+ * 3) kamailioSIPStatusCodesTable_can_[activate|deactivate|delete]()
  *   
  *    - Simplified to always allow activation/deactivation/deletion. 
  *
- * 4) openserSIPStatusCodesTable_set_reserve1()
+ * 4) kamailioSIPStatusCodesTable_set_reserve1()
  *
  *    - The reserve1 phase passes if the row is new, and the rowStatus column
  *      is being set to 'createAndGo'
@@ -64,13 +64,13 @@
  *    - The reserve1 phase passes if the row is not new, and the rowStatus
  *      column is being set to 'destroy'
  *
- * 5) openserSIPStatusCodesTable_get_value()
+ * 5) kamailioSIPStatusCodesTable_get_value()
  *
  *    - Instead of returning a variable binding to either
- *      openserSIPStatusCodeIns or openserSIPStatusCodeOuts, the function 
+ *      kamailioSIPStatusCodeIns or kamailioSIPStatusCodeOuts, the function 
  *      returns a variable binding equal to the current value as per the 
- *      statistics framework, minus either openserSIPStatusCodeIns or
- *      openserSIPStatusCodeOuts
+ *      statistics framework, minus either kamailioSIPStatusCodeIns or
+ *      kamailioSIPStatusCodeOuts
  *
  * You can safely ignore the other functions.  
  *
@@ -89,28 +89,28 @@
 static netsnmp_handler_registration *my_handler = NULL;
 static netsnmp_table_array_callbacks cb;
 
-oid openserSIPStatusCodesTable_oid[] = { 
-	openserSIPStatusCodesTable_TABLE_OID };
+oid kamailioSIPStatusCodesTable_oid[] = { 
+	kamailioSIPStatusCodesTable_TABLE_OID };
 
-size_t openserSIPStatusCodesTable_oid_len = 
-OID_LENGTH(openserSIPStatusCodesTable_oid);
+size_t kamailioSIPStatusCodesTable_oid_len = 
+OID_LENGTH(kamailioSIPStatusCodesTable_oid);
 
 
 /* 
- * Initializes the openserSIPStatusCodesTable module.  This step is easier
+ * Initializes the kamailioSIPStatusCodesTable module.  This step is easier
  * than in the other tables because there is no table population.  All table
  * population takes place during run time. 
  */
-void init_openserSIPStatusCodesTable(void)
+void init_kamailioSIPStatusCodesTable(void)
 {
-	initialize_table_openserSIPStatusCodesTable();
+	initialize_table_kamailioSIPStatusCodesTable();
 }
 
 
 /* the *_row_copy routine */
-static int openserSIPStatusCodesTable_row_copy(
-		openserSIPStatusCodesTable_context * dst,
-		openserSIPStatusCodesTable_context * src)
+static int kamailioSIPStatusCodesTable_row_copy(
+		kamailioSIPStatusCodesTable_context * dst,
+		kamailioSIPStatusCodesTable_context * src)
 {
 	if(!dst||!src)
 		return 1;
@@ -133,11 +133,11 @@ static int openserSIPStatusCodesTable_row_copy(
 	
 
 	/* copy components into the context structure */
-	dst->openserSIPStatusCodeMethod    = src->openserSIPStatusCodeMethod;
-	dst->openserSIPStatusCodeValue     = src->openserSIPStatusCodeValue;
-	dst->openserSIPStatusCodeIns       = src->openserSIPStatusCodeIns;
-	dst->openserSIPStatusCodeOuts      = src->openserSIPStatusCodeOuts;
-	dst->openserSIPStatusCodeRowStatus = src->openserSIPStatusCodeRowStatus;
+	dst->kamailioSIPStatusCodeMethod    = src->kamailioSIPStatusCodeMethod;
+	dst->kamailioSIPStatusCodeValue     = src->kamailioSIPStatusCodeValue;
+	dst->kamailioSIPStatusCodeIns       = src->kamailioSIPStatusCodeIns;
+	dst->kamailioSIPStatusCodeOuts      = src->kamailioSIPStatusCodeOuts;
+	dst->kamailioSIPStatusCodeRowStatus = src->kamailioSIPStatusCodeRowStatus;
 
 	return 0;
 }
@@ -154,8 +154,8 @@ static int openserSIPStatusCodesTable_row_copy(
  * returned if they are invalid.  An index is invalid if it is not between 
  * 100 and 699 (Inclusive).
  */
-int openserSIPStatusCodesTable_extract_index( 
-		openserSIPStatusCodesTable_context * ctx, netsnmp_index * hdr)
+int kamailioSIPStatusCodesTable_extract_index( 
+		kamailioSIPStatusCodesTable_context * ctx, netsnmp_index * hdr)
 {
 
 	/*
@@ -164,8 +164,8 @@ int openserSIPStatusCodesTable_extract_index(
 	 * extract index uses varbinds (netsnmp_variable_list) to parse
 	 * the index OID into the individual components for each index part.
 	 */
-	netsnmp_variable_list var_openserSIPStatusCodeMethod;
-	netsnmp_variable_list var_openserSIPStatusCodeValue;
+	netsnmp_variable_list var_kamailioSIPStatusCodeMethod;
+	netsnmp_variable_list var_kamailioSIPStatusCodeValue;
 	int err;
 
 	/*
@@ -187,40 +187,40 @@ int openserSIPStatusCodesTable_extract_index(
 
  	/* Initialize the two variables responsible for holding our two indices.
 	 */
-	memset(&var_openserSIPStatusCodeMethod, 0x00, 
-			 sizeof(var_openserSIPStatusCodeMethod));
+	memset(&var_kamailioSIPStatusCodeMethod, 0x00, 
+			 sizeof(var_kamailioSIPStatusCodeMethod));
 
-	memset( &var_openserSIPStatusCodeValue, 0x00, 
-			sizeof(var_openserSIPStatusCodeValue) );
+	memset( &var_kamailioSIPStatusCodeValue, 0x00, 
+			sizeof(var_kamailioSIPStatusCodeValue) );
 
-	var_openserSIPStatusCodeMethod.type = ASN_UNSIGNED; 
-	var_openserSIPStatusCodeValue.type  = ASN_UNSIGNED;
+	var_kamailioSIPStatusCodeMethod.type = ASN_UNSIGNED; 
+	var_kamailioSIPStatusCodeValue.type  = ASN_UNSIGNED;
 
-	var_openserSIPStatusCodeMethod.next_variable = 
-		&var_openserSIPStatusCodeValue;
+	var_kamailioSIPStatusCodeMethod.next_variable = 
+		&var_kamailioSIPStatusCodeValue;
 
-	var_openserSIPStatusCodeValue.next_variable = NULL;
+	var_kamailioSIPStatusCodeValue.next_variable = NULL;
 
 	/* parse the oid into the individual index components */
 	err = parse_oid_indexes( hdr->oids, hdr->len, 
-			&var_openserSIPStatusCodeMethod );
+			&var_kamailioSIPStatusCodeMethod );
 
 	if (err == SNMP_ERR_NOERROR) {
 
 		/* copy index components into the context structure */
-		ctx->openserSIPStatusCodeMethod = 
-			*var_openserSIPStatusCodeMethod.val.integer;
-		ctx->openserSIPStatusCodeValue  = 
-			*var_openserSIPStatusCodeValue.val.integer;
+		ctx->kamailioSIPStatusCodeMethod = 
+			*var_kamailioSIPStatusCodeMethod.val.integer;
+		ctx->kamailioSIPStatusCodeValue  = 
+			*var_kamailioSIPStatusCodeValue.val.integer;
    
    
-		if (*var_openserSIPStatusCodeMethod.val.integer < 1)
+		if (*var_kamailioSIPStatusCodeMethod.val.integer < 1)
 		{
 			err = -1;
 		}
 
-		if (*var_openserSIPStatusCodeValue.val.integer < 100 ||
-		    *var_openserSIPStatusCodeValue.val.integer > 699) {
+		if (*var_kamailioSIPStatusCodeValue.val.integer < 100 ||
+		    *var_kamailioSIPStatusCodeValue.val.integer > 699) {
 			err = -1;
 		}
 
@@ -228,7 +228,7 @@ int openserSIPStatusCodesTable_extract_index(
 
 	
 	/* parsing may have allocated memory. free it. */
-	snmp_reset_var_buffers( &var_openserSIPStatusCodeMethod );
+	snmp_reset_var_buffers( &var_kamailioSIPStatusCodeMethod );
 
 	return err;
 }
@@ -242,9 +242,9 @@ int openserSIPStatusCodesTable_extract_index(
  *
  * For our purposes, we have no need for this check, so we always return 1.
  */
-int openserSIPStatusCodesTable_can_activate(
-		openserSIPStatusCodesTable_context *undo_ctx,
-		openserSIPStatusCodesTable_context *row_ctx,
+int kamailioSIPStatusCodesTable_can_activate(
+		kamailioSIPStatusCodesTable_context *undo_ctx,
+		kamailioSIPStatusCodesTable_context *row_ctx,
 		netsnmp_request_group * rg)
 {
 	return 1;
@@ -261,9 +261,9 @@ int openserSIPStatusCodesTable_can_activate(
  * Since this table has no reason why this shouldn't be allowed, we always
  * return 1;
  */
-int openserSIPStatusCodesTable_can_deactivate(
-		openserSIPStatusCodesTable_context *undo_ctx,
-		openserSIPStatusCodesTable_context *row_ctx,
+int kamailioSIPStatusCodesTable_can_deactivate(
+		kamailioSIPStatusCodesTable_context *undo_ctx,
+		kamailioSIPStatusCodesTable_context *row_ctx,
 		netsnmp_request_group * rg)
 {
 	return 1;
@@ -279,12 +279,12 @@ int openserSIPStatusCodesTable_can_deactivate(
  * Since this table ha no reason why row deletion shouldn't be allowed, we
  * always return 1, unless we can't deactivate.  
  */
-int openserSIPStatusCodesTable_can_delete(
-		openserSIPStatusCodesTable_context *undo_ctx,
-		openserSIPStatusCodesTable_context *row_ctx,
+int kamailioSIPStatusCodesTable_can_delete(
+		kamailioSIPStatusCodesTable_context *undo_ctx,
+		kamailioSIPStatusCodesTable_context *row_ctx,
 		netsnmp_request_group * rg)
 {
-	if(openserSIPStatusCodesTable_can_deactivate(undo_ctx,row_ctx,rg) != 1)
+	if(kamailioSIPStatusCodesTable_can_deactivate(undo_ctx,row_ctx,rg) != 1)
 		return 0;
 	
 	return 1;
@@ -298,7 +298,7 @@ int openserSIPStatusCodesTable_can_delete(
  * *_set_reserve_* functions can be used to prevent the row from being inserted
  * into the table even if the row passes any preliminary checks set here. 
  *
- * Returns a newly allocated openserSIPRegUserLookupTable_context structure (a
+ * Returns a newly allocated kamailioSIPRegUserLookupTable_context structure (a
  * row in the table) if the indexes are legal.  NULL will be returned otherwise.
  *
  * The function has been modified from its original form, in that it will store
@@ -309,20 +309,20 @@ int openserSIPStatusCodesTable_can_delete(
  * This value will be used in the future to calculate the delta between now and
  * the time this row has been read.  
  * */
-openserSIPStatusCodesTable_context *
-openserSIPStatusCodesTable_create_row( netsnmp_index* hdr)
+kamailioSIPStatusCodesTable_context *
+kamailioSIPStatusCodesTable_create_row( netsnmp_index* hdr)
 {
 	stat_var *in_status_code;
 	stat_var *out_status_code;
 
-	openserSIPStatusCodesTable_context * ctx =
-		SNMP_MALLOC_TYPEDEF(openserSIPStatusCodesTable_context);
+	kamailioSIPStatusCodesTable_context * ctx =
+		SNMP_MALLOC_TYPEDEF(kamailioSIPStatusCodesTable_context);
 	if(!ctx)
 		return NULL;
 		
 	/* The *_extract_index funtion already validates the indices, so we
 	 * don't need to do any further evaluations here.  */
-	if(openserSIPStatusCodesTable_extract_index( ctx, hdr )) {
+	if(kamailioSIPStatusCodesTable_extract_index( ctx, hdr )) {
 		if (NULL != ctx->index.oids)
 			free(ctx->index.oids);
 		free(ctx);
@@ -332,14 +332,14 @@ openserSIPStatusCodesTable_create_row( netsnmp_index* hdr)
 
 	/* The indices were already set up in the extract_index function
 	 * above. */
-	ctx->openserSIPStatusCodeIns       = 0;
-	ctx->openserSIPStatusCodeOuts      = 0;
-	ctx->openserSIPStatusCodeRowStatus = 0;
+	ctx->kamailioSIPStatusCodeIns       = 0;
+	ctx->kamailioSIPStatusCodeOuts      = 0;
+	ctx->kamailioSIPStatusCodeRowStatus = 0;
 
 	/* Retrieve the index for the status code, and then assign the starting
 	 * values.  The starting values will be used to calculate deltas during
 	 * the next snmpget/snmpwalk/snmptable/etc. */
-	int codeIndex = ctx->openserSIPStatusCodeValue;
+	int codeIndex = ctx->kamailioSIPStatusCodeValue;
 
 	ctx->startingInStatusCodeValue  = 0;
 	ctx->startingOutStatusCodeValue = 0;
@@ -364,20 +364,20 @@ openserSIPStatusCodesTable_create_row( netsnmp_index* hdr)
 /* 
  * Auto-generated function.  The *_duplicate row routine
  */
-openserSIPStatusCodesTable_context *
-openserSIPStatusCodesTable_duplicate_row( 
-		openserSIPStatusCodesTable_context * row_ctx)
+kamailioSIPStatusCodesTable_context *
+kamailioSIPStatusCodesTable_duplicate_row( 
+		kamailioSIPStatusCodesTable_context * row_ctx)
 {
-	openserSIPStatusCodesTable_context * dup;
+	kamailioSIPStatusCodesTable_context * dup;
 
 	if(!row_ctx)
 		return NULL;
 
-	dup = SNMP_MALLOC_TYPEDEF(openserSIPStatusCodesTable_context);
+	dup = SNMP_MALLOC_TYPEDEF(kamailioSIPStatusCodesTable_context);
 	if(!dup)
 		return NULL;
 		
-	if(openserSIPStatusCodesTable_row_copy(dup,row_ctx)) {
+	if(kamailioSIPStatusCodesTable_row_copy(dup,row_ctx)) {
 		free(dup);
 		dup = NULL;
 	}
@@ -393,8 +393,8 @@ openserSIPStatusCodesTable_duplicate_row(
  * deleted.  However, in our implementation there is never a reason why this
  * function can't be called. 
  */
-netsnmp_index * openserSIPStatusCodesTable_delete_row( 
-		openserSIPStatusCodesTable_context * ctx )
+netsnmp_index * kamailioSIPStatusCodesTable_delete_row( 
+		kamailioSIPStatusCodesTable_context * ctx )
 {
 	if(ctx->index.oids)
 		free(ctx->index.oids);
@@ -424,10 +424,10 @@ netsnmp_index * openserSIPStatusCodesTable_delete_row(
  * any other condition is considered illegal, and will result in an SNMP error
  * being returned. 
  */
-void openserSIPStatusCodesTable_set_reserve1( netsnmp_request_group *rg )
+void kamailioSIPStatusCodesTable_set_reserve1( netsnmp_request_group *rg )
 {
-	openserSIPStatusCodesTable_context *row_ctx =
-		(openserSIPStatusCodesTable_context *)rg->existing_row;
+	kamailioSIPStatusCodesTable_context *row_ctx =
+		(kamailioSIPStatusCodesTable_context *)rg->existing_row;
 
 	netsnmp_variable_list      *var;
 	netsnmp_request_group_item *current;
@@ -443,24 +443,24 @@ void openserSIPStatusCodesTable_set_reserve1( netsnmp_request_group *rg )
 
 		switch(current->tri->colnum) 
 		{
-			case COLUMN_OPENSERSIPSTATUSCODEROWSTATUS:
+			case COLUMN_KAMAILIOSIPSTATUSCODEROWSTATUS:
 
 				/** RowStatus = ASN_INTEGER */
 				rc = netsnmp_check_vb_type_and_size(var, 
 						ASN_INTEGER,
 						sizeof(
-						row_ctx->openserSIPStatusCodeRowStatus));
+						row_ctx->kamailioSIPStatusCodeRowStatus));
 			
 				/* Want to make sure that if it already exists that it
 				 * is setting it to 'destroy', or if it doesn't exist,
 				 * that it is setting it to 'createAndGo' */
-				if (row_ctx->openserSIPStatusCodeRowStatus == 0 && 
+				if (row_ctx->kamailioSIPStatusCodeRowStatus == 0 && 
 				    *var->val.integer != TC_ROWSTATUS_CREATEANDGO) 
 				{
 					rc = SNMP_ERR_BADVALUE;
 				}			
 
-				else if (row_ctx->openserSIPStatusCodeRowStatus ==
+				else if (row_ctx->kamailioSIPStatusCodeRowStatus ==
 						TC_ROWSTATUS_ACTIVE && 
 						*var->val.integer != 
 						TC_ROWSTATUS_DESTROY) 
@@ -473,7 +473,7 @@ void openserSIPStatusCodesTable_set_reserve1( netsnmp_request_group *rg )
 
 			default: /** We shouldn't get here */
 				rc = SNMP_ERR_GENERR;
-				snmp_log(LOG_ERR, "unknown column in openserSIP"
+				snmp_log(LOG_ERR, "unknown column in kamailioSIP"
 						"StatusCodesTable_set_reserve1\n");
 		}
 
@@ -493,10 +493,10 @@ void openserSIPStatusCodesTable_set_reserve1( netsnmp_request_group *rg )
  * last-minute conditions not being met.  However, we don't have any such
  * conditions, so we leave the default function as is.
  */
-void openserSIPStatusCodesTable_set_reserve2( netsnmp_request_group *rg )
+void kamailioSIPStatusCodesTable_set_reserve2( netsnmp_request_group *rg )
 {
-	openserSIPStatusCodesTable_context *undo_ctx = 
-		(openserSIPStatusCodesTable_context *)rg->undo_info;
+	kamailioSIPStatusCodesTable_context *undo_ctx = 
+		(kamailioSIPStatusCodesTable_context *)rg->undo_info;
 
 	netsnmp_request_group_item *current;
 	netsnmp_variable_list      *var;
@@ -513,11 +513,11 @@ void openserSIPStatusCodesTable_set_reserve2( netsnmp_request_group *rg )
 		switch(current->tri->colnum) 
 		{
 
-			case COLUMN_OPENSERSIPSTATUSCODEROWSTATUS:
+			case COLUMN_KAMAILIOSIPSTATUSCODEROWSTATUS:
 				/** RowStatus = ASN_INTEGER */
 				rc = netsnmp_check_vb_rowstatus(current->ri->requestvb,
 					undo_ctx ? 
-					undo_ctx->openserSIPStatusCodeRowStatus:0);
+					undo_ctx->kamailioSIPStatusCodeRowStatus:0);
 
 				rg->rg_void = current->ri;
 				break;
@@ -543,15 +543,15 @@ void openserSIPStatusCodesTable_set_reserve2( netsnmp_request_group *rg )
  * In our case, we don't require any changes.  So we leave the original
  * auto-generated code as is.   
  */
-void openserSIPStatusCodesTable_set_action( netsnmp_request_group *rg )
+void kamailioSIPStatusCodesTable_set_action( netsnmp_request_group *rg )
 {
 	netsnmp_variable_list *var;
 
-	openserSIPStatusCodesTable_context *row_ctx = 
-		(openserSIPStatusCodesTable_context *)rg->existing_row;
+	kamailioSIPStatusCodesTable_context *row_ctx = 
+		(kamailioSIPStatusCodesTable_context *)rg->existing_row;
 
-	openserSIPStatusCodesTable_context *undo_ctx = 
-		(openserSIPStatusCodesTable_context *)rg->undo_info;
+	kamailioSIPStatusCodesTable_context *undo_ctx = 
+		(kamailioSIPStatusCodesTable_context *)rg->undo_info;
 
 	netsnmp_request_group_item *current;
 
@@ -565,10 +565,10 @@ void openserSIPStatusCodesTable_set_action( netsnmp_request_group *rg )
 
 		switch(current->tri->colnum) 
 		{
-			case COLUMN_OPENSERSIPSTATUSCODEROWSTATUS:
+			case COLUMN_KAMAILIOSIPSTATUSCODEROWSTATUS:
 			
 				/** RowStatus = ASN_INTEGER */
-				row_ctx->openserSIPStatusCodeRowStatus = 
+				row_ctx->kamailioSIPStatusCodeRowStatus = 
 					*var->val.integer;
 
 				if (*var->val.integer == TC_ROWSTATUS_CREATEANDGO)
@@ -583,7 +583,7 @@ void openserSIPStatusCodesTable_set_action( netsnmp_request_group *rg )
 					/* We should never be here, because the RESERVE
 					 * functions should have taken care of all other
 					 * values. */
-				LM_ERR("Invalid RowStatus in openserSIPStatusCodesTable\n");
+				LM_ERR("Invalid RowStatus in kamailioSIPStatusCodesTable\n");
 				}
 
 				break;
@@ -597,9 +597,9 @@ void openserSIPStatusCodesTable_set_action( netsnmp_request_group *rg )
 	 * done with all the columns. Could check row related
 	 * requirements here.
 	 */
-#ifndef openserSIPStatusCodesTable_CAN_MODIFY_ACTIVE_ROW
-	if( undo_ctx && RS_IS_ACTIVE(undo_ctx->openserSIPStatusCodeRowStatus) &&
-		row_ctx && RS_IS_ACTIVE(row_ctx->openserSIPStatusCodeRowStatus)) 
+#ifndef kamailioSIPStatusCodesTable_CAN_MODIFY_ACTIVE_ROW
+	if( undo_ctx && RS_IS_ACTIVE(undo_ctx->kamailioSIPStatusCodeRowStatus) &&
+		row_ctx && RS_IS_ACTIVE(row_ctx->kamailioSIPStatusCodeRowStatus)) 
 	{
 			row_err = 1;
 	}
@@ -610,9 +610,9 @@ void openserSIPStatusCodesTable_set_action( netsnmp_request_group *rg )
 	 */
 	row_err = netsnmp_table_array_check_row_status(&cb, rg, 
 			row_ctx ? 
-			&row_ctx->openserSIPStatusCodeRowStatus : NULL,
+			&row_ctx->kamailioSIPStatusCodeRowStatus : NULL,
 			undo_ctx ? 
-			&undo_ctx->openserSIPStatusCodeRowStatus : NULL);
+			&undo_ctx->kamailioSIPStatusCodeRowStatus : NULL);
 	if(row_err) {
 		netsnmp_set_mode_request_error(MODE_SET_BEGIN,
 				(netsnmp_request_info*)rg->rg_void, row_err);
@@ -626,7 +626,7 @@ void openserSIPStatusCodesTable_set_action( netsnmp_request_group *rg )
  * The COMMIT phase is used to do any extra processing after the ACTION phase.
  * In our table, there is nothing to do, so the function body is empty.
  */
-void openserSIPStatusCodesTable_set_commit( netsnmp_request_group *rg )
+void kamailioSIPStatusCodesTable_set_commit( netsnmp_request_group *rg )
 {
 
 }
@@ -638,7 +638,7 @@ void openserSIPStatusCodesTable_set_commit( netsnmp_request_group *rg )
  * all these resources in earlier functions.  So for our purposes, the function
  * body is empty. 
  */
-void openserSIPStatusCodesTable_set_free( netsnmp_request_group *rg )
+void kamailioSIPStatusCodesTable_set_free( netsnmp_request_group *rg )
 {
 
 }
@@ -649,7 +649,7 @@ void openserSIPStatusCodesTable_set_free( netsnmp_request_group *rg )
  * We don't have anything complicated enough to warrant putting anything in this
  * function.  Therefore, its just left with an empty function body. 
  */
-void openserSIPStatusCodesTable_set_undo( netsnmp_request_group *rg )
+void kamailioSIPStatusCodesTable_set_undo( netsnmp_request_group *rg )
 {
 
 }
@@ -657,17 +657,17 @@ void openserSIPStatusCodesTable_set_undo( netsnmp_request_group *rg )
 
 
 /*
- * Initialize the openserSIPStatusCodesTable table by defining how it is
+ * Initialize the kamailioSIPStatusCodesTable table by defining how it is
  * structured. 
  *
  * This function is mostly auto-generated.
  */
-void initialize_table_openserSIPStatusCodesTable(void)
+void initialize_table_kamailioSIPStatusCodesTable(void)
 {
 	netsnmp_table_registration_info *table_info;
 
 	if(my_handler) {
-		snmp_log(LOG_ERR, "initialize_table_openserSIPStatusCodes"
+		snmp_log(LOG_ERR, "initialize_table_kamailioSIPStatusCodes"
 				"Table_handler called again\n");
 		return;
 	}
@@ -678,79 +678,79 @@ void initialize_table_openserSIPStatusCodesTable(void)
 	table_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_registration_info);
 
 	my_handler = netsnmp_create_handler_registration(
-			"openserSIPStatusCodesTable",
+			"kamailioSIPStatusCodesTable",
 			netsnmp_table_array_helper_handler,
-			openserSIPStatusCodesTable_oid,
-			openserSIPStatusCodesTable_oid_len,
+			kamailioSIPStatusCodesTable_oid,
+			kamailioSIPStatusCodesTable_oid_len,
 			HANDLER_CAN_RWRITE);
 			
 	if (!my_handler || !table_info) {
-		snmp_log(LOG_ERR, "malloc failed in initialize_table_openserSIP"
+		snmp_log(LOG_ERR, "malloc failed in initialize_table_kamailioSIP"
 				"StatusCodesTable_handler\n");
 		return; /** mallocs failed */
 	}
 
-	/** index: openserSIPStatusCodeMethod */
+	/** index: kamailioSIPStatusCodeMethod */
 	netsnmp_table_helper_add_index(table_info, ASN_UNSIGNED);
-	/** index: openserSIPStatusCodeValue */
+	/** index: kamailioSIPStatusCodeValue */
 	netsnmp_table_helper_add_index(table_info, ASN_UNSIGNED);
 
-	table_info->min_column = openserSIPStatusCodesTable_COL_MIN;
-	table_info->max_column = openserSIPStatusCodesTable_COL_MAX;
+	table_info->min_column = kamailioSIPStatusCodesTable_COL_MIN;
+	table_info->max_column = kamailioSIPStatusCodesTable_COL_MAX;
 
 	/***************************************************
 	 * registering the table with the master agent
 	 */
-	cb.get_value = openserSIPStatusCodesTable_get_value;
+	cb.get_value = kamailioSIPStatusCodesTable_get_value;
 
 	cb.container = 
-		netsnmp_container_find("openserSIPStatusCodesTable_primary:"
-				"openserSIPStatusCodesTable:"
+		netsnmp_container_find("kamailioSIPStatusCodesTable_primary:"
+				"kamailioSIPStatusCodesTable:"
 				"table_container");
 
-#ifdef openserSIPStatusCodesTable_CUSTOM_SORT
+#ifdef kamailioSIPStatusCodesTable_CUSTOM_SORT
 	netsnmp_container_add_index(cb.container,
 			netsnmp_container_find(
-				"openserSIPStatusCodesTable_custom:"
-				"openserSIPStatusCodesTable:"
+				"kamailioSIPStatusCodesTable_custom:"
+				"kamailioSIPStatusCodesTable:"
 				"table_container"));
 
-	cb.container->next->compare = openserSIPStatusCodesTable_cmp;
+	cb.container->next->compare = kamailioSIPStatusCodesTable_cmp;
 #endif
 	cb.can_set = 1;
 
 	cb.create_row    =
-		(UserRowMethod*)openserSIPStatusCodesTable_create_row;
+		(UserRowMethod*)kamailioSIPStatusCodesTable_create_row;
 
 	cb.duplicate_row = 
-		(UserRowMethod*)openserSIPStatusCodesTable_duplicate_row;
+		(UserRowMethod*)kamailioSIPStatusCodesTable_duplicate_row;
 
 	cb.delete_row    = 
-		(UserRowMethod*)openserSIPStatusCodesTable_delete_row;
+		(UserRowMethod*)kamailioSIPStatusCodesTable_delete_row;
 
 	cb.row_copy      = (Netsnmp_User_Row_Operation *)
-		openserSIPStatusCodesTable_row_copy;
+		kamailioSIPStatusCodesTable_row_copy;
 
 	cb.can_activate  = (Netsnmp_User_Row_Action *)
-		openserSIPStatusCodesTable_can_activate;
+		kamailioSIPStatusCodesTable_can_activate;
 
 	cb.can_deactivate = (Netsnmp_User_Row_Action *)
-		openserSIPStatusCodesTable_can_deactivate;
+		kamailioSIPStatusCodesTable_can_deactivate;
 
 	cb.can_delete     = 
-		(Netsnmp_User_Row_Action *)openserSIPStatusCodesTable_can_delete;
+		(Netsnmp_User_Row_Action *)kamailioSIPStatusCodesTable_can_delete;
 
-	cb.set_reserve1   = openserSIPStatusCodesTable_set_reserve1;
-	cb.set_reserve2   = openserSIPStatusCodesTable_set_reserve2;
+	cb.set_reserve1   = kamailioSIPStatusCodesTable_set_reserve1;
+	cb.set_reserve2   = kamailioSIPStatusCodesTable_set_reserve2;
 	
-	cb.set_action = openserSIPStatusCodesTable_set_action;
-	cb.set_commit = openserSIPStatusCodesTable_set_commit;
+	cb.set_action = kamailioSIPStatusCodesTable_set_action;
+	cb.set_commit = kamailioSIPStatusCodesTable_set_commit;
 	
-	cb.set_free = openserSIPStatusCodesTable_set_free;
-	cb.set_undo = openserSIPStatusCodesTable_set_undo;
+	cb.set_free = kamailioSIPStatusCodesTable_set_free;
+	cb.set_undo = kamailioSIPStatusCodesTable_set_undo;
 	
-	DEBUGMSGTL(("initialize_table_openserSIPStatusCodesTable",
-				"Registering table openserSIPStatusCodesTable "
+	DEBUGMSGTL(("initialize_table_kamailioSIPStatusCodesTable",
+				"Registering table kamailioSIPStatusCodesTable "
 				"as a table array\n"));
 	
 	netsnmp_table_container_register(my_handler, table_info, &cb,
@@ -770,7 +770,7 @@ void initialize_table_openserSIPStatusCodesTable(void)
  * ins and how many outs have been received (With respect to the message code)
  * since this row was created. 
  */
-int openserSIPStatusCodesTable_get_value(
+int kamailioSIPStatusCodesTable_get_value(
 			netsnmp_request_info *request,
 			netsnmp_index *item,
 			netsnmp_table_request_info *table_info )
@@ -779,76 +779,76 @@ int openserSIPStatusCodesTable_get_value(
 
 	netsnmp_variable_list *var = request->requestvb;
 
-	openserSIPStatusCodesTable_context *context = 
-		(openserSIPStatusCodesTable_context *)item;
+	kamailioSIPStatusCodesTable_context *context = 
+		(kamailioSIPStatusCodesTable_context *)item;
 
 	/* Retrieve the statusCodeIdx so we can calculate deltas between current
 	 * values and previous values. */
-	int statusCodeIdx = context->openserSIPStatusCodeValue;
+	int statusCodeIdx = context->kamailioSIPStatusCodeValue;
 
 	switch(table_info->colnum) 
 	{
-		case COLUMN_OPENSERSIPSTATUSCODEINS:
+		case COLUMN_KAMAILIOSIPSTATUSCODEINS:
 
-			context->openserSIPStatusCodeIns = 0;
+			context->kamailioSIPStatusCodeIns = 0;
 
 			the_stat = get_stat_var_from_num_code(statusCodeIdx, 0);
 
 			if (the_stat != NULL)  
 			{
 				/* Calculate the Delta */
-				context->openserSIPStatusCodeIns = get_stat_val(the_stat) -
+				context->kamailioSIPStatusCodeIns = get_stat_val(the_stat) -
 					context->startingInStatusCodeValue;
 			}
 
 			snmp_set_var_typed_value(var, ASN_COUNTER,
 					(unsigned char*)
-					&context->openserSIPStatusCodeIns,
-					sizeof(context->openserSIPStatusCodeIns));
+					&context->kamailioSIPStatusCodeIns,
+					sizeof(context->kamailioSIPStatusCodeIns));
 			break;
 	
-		case COLUMN_OPENSERSIPSTATUSCODEOUTS:
+		case COLUMN_KAMAILIOSIPSTATUSCODEOUTS:
 			
-			context->openserSIPStatusCodeOuts = 0;
+			context->kamailioSIPStatusCodeOuts = 0;
 
 			the_stat = get_stat_var_from_num_code(statusCodeIdx, 1);
 
 			if (the_stat != NULL)
 			{
 				/* Calculate the Delta */
-				context->openserSIPStatusCodeOuts =
+				context->kamailioSIPStatusCodeOuts =
 					get_stat_val(the_stat) -
 					context->startingOutStatusCodeValue;
 			}
 			snmp_set_var_typed_value(var, ASN_COUNTER,
 					 (unsigned char*)
-					 &context->openserSIPStatusCodeOuts,
-					 sizeof(context->openserSIPStatusCodeOuts) );
+					 &context->kamailioSIPStatusCodeOuts,
+					 sizeof(context->kamailioSIPStatusCodeOuts) );
 		break;
 	
-		case COLUMN_OPENSERSIPSTATUSCODEROWSTATUS:
+		case COLUMN_KAMAILIOSIPSTATUSCODEROWSTATUS:
 			/** RowStatus = ASN_INTEGER */
 			snmp_set_var_typed_value(var, ASN_INTEGER,
 					 (unsigned char*)
-					 &context->openserSIPStatusCodeRowStatus,
-					 sizeof(context->openserSIPStatusCodeRowStatus) );
+					 &context->kamailioSIPStatusCodeRowStatus,
+					 sizeof(context->kamailioSIPStatusCodeRowStatus) );
 		break;
 	
 	default: /** We shouldn't get here */
 		snmp_log(LOG_ERR, "unknown column in "
-				 "openserSIPStatusCodesTable_get_value\n");
+				 "kamailioSIPStatusCodesTable_get_value\n");
 		return SNMP_ERR_GENERR;
 	}
 	return SNMP_ERR_NOERROR;
 }
 
 /*
- * openserSIPRegUserLookupTable_get_by_idx
+ * kamailioSIPRegUserLookupTable_get_by_idx
  */
-const openserSIPStatusCodesTable_context *
-openserSIPStatusCodesTable_get_by_idx(netsnmp_index * hdr)
+const kamailioSIPStatusCodesTable_context *
+kamailioSIPStatusCodesTable_get_by_idx(netsnmp_index * hdr)
 {
-	return (const openserSIPStatusCodesTable_context *)
+	return (const kamailioSIPStatusCodesTable_context *)
 		CONTAINER_FIND(cb.container, hdr );
 }
 

modules_k/snmpstats/snmpSIPStatusCodesTable.h

@@ -26,13 +26,13 @@
  * --------
  * 2006-11-23 initial version (jmagder)
  * 2007-02-16 Moved all OID registrations from the experimental branch to 
- *            OpenSER's IANA assigned enterprise branch. (jmagder)
+ *            Kamailio's IANA assigned enterprise branch. (jmagder)
  * 
  * Note: this file originally auto-generated by mib2c using
  * mib2c.array-user.conf
  *
- * The file implements the openserSIPStatusCodesTable.  For a full description
- * of the table, please see the OPENSER-SIP-COMMON-MIB.
+ * The file implements the kamailioSIPStatusCodesTable.  For a full description
+ * of the table, please see the KAMAILIO-SIP-COMMON-MIB.
  *
  * This file consists of many more functions than the other header files.  
  * This is because this table is writable, bringing a lot of SNMP overhead.
@@ -40,23 +40,23 @@
  * Most of the contents are auto-generated (aside from white space and comment
  * changes), and can be ignored.  The functions that have been modified are:
  *
- * 1) openserSIPStatusCodesTable_create_row()
+ * 1) kamailioSIPStatusCodesTable_create_row()
  *
- * 2) openserSIPStatusCodesTable_extract_index() 
+ * 2) kamailioSIPStatusCodesTable_extract_index() 
  *
- * 3) openserSIPStatusCodesTable_can_[activate|deactivate|delete]()
+ * 3) kamailioSIPStatusCodesTable_can_[activate|deactivate|delete]()
  *   
- * 4) openserSIPStatusCodesTable_set_reserve1()
+ * 4) kamailioSIPStatusCodesTable_set_reserve1()
  *
- * 5) openserSIPStatusCodesTable_get_value()
+ * 5) kamailioSIPStatusCodesTable_get_value()
  *
- * Full details can be found in openserSIPStatusCodesTable.c.  You can safely
+ * Full details can be found in kamailioSIPStatusCodesTable.c.  You can safely
  * ignore the other functions.
  *
  */
 
-#ifndef OPENSERSIPSTATUSCODESTABLE_H
-#define OPENSERSIPSTATUSCODESTABLE_H
+#ifndef KAMAILIOSIPSTATUSCODESTABLE_H
+#define KAMAILIOSIPSTATUSCODESTABLE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -73,41 +73,41 @@ extern "C" {
  * The structure has been mostly auto-generated, but its semantics have been
  * changed.  
  *
- * Specifically, the openserSIPStatusCodeIns and openserSIPStatusCodeOuts
+ * Specifically, the kamailioSIPStatusCodeIns and kamailioSIPStatusCodeOuts
  * variables don't store the total number of messages sent or received from the
  * system at the time of a SNMP GET request.  Instead, they store the number of
  * messages in or out (with respect to the message code specified by
- * openserSIPStatusCodeValue) at the time of the rows *creation*. 
+ * kamailioSIPStatusCodeValue) at the time of the rows *creation*. 
  *
  * When the get request is received, the statistics framework will be queried,
  * and these values subtracted from that query.  This effectively gives us how
  * many of the given message codes have occured since the creation of the row,
- * insead of since OpenSER first loaded up.
+ * insead of since Kamailio first loaded up.
  */
-typedef struct openserSIPStatusCodesTable_context_s {
+typedef struct kamailioSIPStatusCodesTable_context_s {
 	
 	/* The container interface requires that this be first. */
 	netsnmp_index index; 
 
 	/* The first index. */
-	unsigned long openserSIPStatusCodeMethod;
+	unsigned long kamailioSIPStatusCodeMethod;
 	
 	/* The second index, specifying which status code to monitor */
-	unsigned long openserSIPStatusCodeValue;
+	unsigned long kamailioSIPStatusCodeValue;
 
 	/* Stores the current status code value - startingInStatusCodeValue 
 	 * (at the time this row was created)  */
-	unsigned long openserSIPStatusCodeIns;
+	unsigned long kamailioSIPStatusCodeIns;
 
 	/* Stores the current status code value - startingOutStatusCodeValue 
 	 * (at the time this row was created)  */
-	unsigned long openserSIPStatusCodeOuts;
+	unsigned long kamailioSIPStatusCodeOuts;
 
 	/* Initialized to zero at startup to signify uninitialized.  This can
 	 * only be assigned createAndGo(4) at this point.  It can also be 
 	 * assigned destroy(6), but only if the value is in the active(1) state.
 	 */
-	long openserSIPStatusCodeRowStatus;
+	long kamailioSIPStatusCodeRowStatus;
 
 	/* Added automatically, but not really used by us. */
 	void * data;
@@ -115,22 +115,22 @@ typedef struct openserSIPStatusCodesTable_context_s {
 	long startingInStatusCodeValue;
 	long startingOutStatusCodeValue;
 
-} openserSIPStatusCodesTable_context;
+} kamailioSIPStatusCodesTable_context;
 
 /* 
- * Initializes the openserSIPStatusCodesTable module.  This step is easier
+ * Initializes the kamailioSIPStatusCodesTable module.  This step is easier
  * than in the other tables because there is no table population.  All table
  * population takes place during run time. 
  */
-void init_openserSIPStatusCodesTable(void);
+void init_kamailioSIPStatusCodesTable(void);
 
 /*
- * Initialize the openserSIPStatusCodesTable table by defining how it is
+ * Initialize the kamailioSIPStatusCodesTable table by defining how it is
  * structured. 
  *
  * This function is mostly auto-generated.
  */
-void initialize_table_openserSIPStatusCodesTable(void);
+void initialize_table_kamailioSIPStatusCodesTable(void);
 
 /*
  * This function is called to handle SNMP GET requests.  
@@ -145,87 +145,87 @@ void initialize_table_openserSIPStatusCodesTable(void);
  * ins and how many outs have been received (With respect to the message code)
  * since this row was created. 
  */
-int   openserSIPStatusCodesTable_get_value(netsnmp_request_info *, 
+int   kamailioSIPStatusCodesTable_get_value(netsnmp_request_info *, 
 		netsnmp_index *, netsnmp_table_request_info *);
 
-const openserSIPStatusCodesTable_context * 
-	openserSIPStatusCodesTable_get_by_idx(netsnmp_index *);
+const kamailioSIPStatusCodesTable_context * 
+	kamailioSIPStatusCodesTable_get_by_idx(netsnmp_index *);
 
-const openserSIPStatusCodesTable_context * 
-	openserSIPStatusCodesTable_get_by_idx_rs(netsnmp_index *, 
+const kamailioSIPStatusCodesTable_context * 
+	kamailioSIPStatusCodesTable_get_by_idx_rs(netsnmp_index *, 
 			int row_status);
 
 /* oid declarations */
-extern oid openserSIPStatusCodesTable_oid[];
-extern size_t openserSIPStatusCodesTable_oid_len;
+extern oid kamailioSIPStatusCodesTable_oid[];
+extern size_t kamailioSIPStatusCodesTable_oid_len;
 
-#define openserSIPStatusCodesTable_TABLE_OID OPENSER_OID,3,1,1,1,5,1
+#define kamailioSIPStatusCodesTable_TABLE_OID KAMAILIO_OID,3,1,1,1,5,1
 	
-/* column number definitions for table openserSIPStatusCodesTable */
-#define COLUMN_OPENSERSIPSTATUSCODEMETHOD    1
-#define COLUMN_OPENSERSIPSTATUSCODEVALUE     2
-#define COLUMN_OPENSERSIPSTATUSCODEINS       3
-#define COLUMN_OPENSERSIPSTATUSCODEOUTS      4
-#define COLUMN_OPENSERSIPSTATUSCODEROWSTATUS 5
+/* column number definitions for table kamailioSIPStatusCodesTable */
+#define COLUMN_KAMAILIOSIPSTATUSCODEMETHOD    1
+#define COLUMN_KAMAILIOSIPSTATUSCODEVALUE     2
+#define COLUMN_KAMAILIOSIPSTATUSCODEINS       3
+#define COLUMN_KAMAILIOSIPSTATUSCODEOUTS      4
+#define COLUMN_KAMAILIOSIPSTATUSCODEROWSTATUS 5
 
-#define openserSIPStatusCodesTable_COL_MIN 3
-#define openserSIPStatusCodesTable_COL_MAX 5
+#define kamailioSIPStatusCodesTable_COL_MIN 3
+#define kamailioSIPStatusCodesTable_COL_MAX 5
 
 /* Handles index extraction for row creation */
-int openserSIPStatusCodesTable_extract_index( 
-		openserSIPStatusCodesTable_context * ctx, netsnmp_index * hdr );
+int kamailioSIPStatusCodesTable_extract_index( 
+		kamailioSIPStatusCodesTable_context * ctx, netsnmp_index * hdr );
 
 /* Handle RESERVE1 and RESERVE2 phases of an SNMP SET */
-void openserSIPStatusCodesTable_set_reserve1( netsnmp_request_group * );
-void openserSIPStatusCodesTable_set_reserve2( netsnmp_request_group * );
+void kamailioSIPStatusCodesTable_set_reserve1( netsnmp_request_group * );
+void kamailioSIPStatusCodesTable_set_reserve2( netsnmp_request_group * );
 
 /* Handle the SET and ACTION phases of an SNMP SET */
-void openserSIPStatusCodesTable_set_action( netsnmp_request_group * );
-void openserSIPStatusCodesTable_set_commit( netsnmp_request_group * );
+void kamailioSIPStatusCodesTable_set_action( netsnmp_request_group * );
+void kamailioSIPStatusCodesTable_set_commit( netsnmp_request_group * );
 
 /* Handle Resource cleanup if the ACTION or RESERVE1/RESERVE2 phases of an
  * SNMPSET fail */
-void openserSIPStatusCodesTable_set_free( netsnmp_request_group * );
-void openserSIPStatusCodesTable_set_undo( netsnmp_request_group * );
+void kamailioSIPStatusCodesTable_set_free( netsnmp_request_group * );
+void kamailioSIPStatusCodesTable_set_undo( netsnmp_request_group * );
 
-openserSIPStatusCodesTable_context * openserSIPStatusCodesTable_duplicate_row(
-		openserSIPStatusCodesTable_context* );
+kamailioSIPStatusCodesTable_context * kamailioSIPStatusCodesTable_duplicate_row(
+		kamailioSIPStatusCodesTable_context* );
 
 
-netsnmp_index * openserSIPStatusCodesTable_delete_row( 
-		openserSIPStatusCodesTable_context* );
+netsnmp_index * kamailioSIPStatusCodesTable_delete_row( 
+		kamailioSIPStatusCodesTable_context* );
 
 /* Used to check if there is a reason why a row can't be activated 
  * (There is no reason in our implementation)
  */
-int openserSIPStatusCodesTable_can_activate(
-		openserSIPStatusCodesTable_context *undo_ctx,
-		openserSIPStatusCodesTable_context *row_ctx,
+int kamailioSIPStatusCodesTable_can_activate(
+		kamailioSIPStatusCodesTable_context *undo_ctx,
+		kamailioSIPStatusCodesTable_context *row_ctx,
 		netsnmp_request_group * rg);
 
 /* Used to check if there is a reason why a row can't be deactivated 
  * (There is no reason in our implementation)
  */
-int openserSIPStatusCodesTable_can_deactivate(
-		openserSIPStatusCodesTable_context *undo_ctx,
-		openserSIPStatusCodesTable_context *row_ctx,
+int kamailioSIPStatusCodesTable_can_deactivate(
+		kamailioSIPStatusCodesTable_context *undo_ctx,
+		kamailioSIPStatusCodesTable_context *row_ctx,
 		netsnmp_request_group * rg);
 
 /* Used to check if there is a reason why a row can't be deleted
  * (There is no reason in our implementation)
  */
-int openserSIPStatusCodesTable_can_delete(
-		openserSIPStatusCodesTable_context *undo_ctx,
-		openserSIPStatusCodesTable_context *row_ctx,
+int kamailioSIPStatusCodesTable_can_delete(
+		kamailioSIPStatusCodesTable_context *undo_ctx,
+		kamailioSIPStatusCodesTable_context *row_ctx,
 		netsnmp_request_group * rg);
 	
 	
-openserSIPStatusCodesTable_context * 
-		openserSIPStatusCodesTable_create_row( netsnmp_index* );
+kamailioSIPStatusCodesTable_context * 
+		kamailioSIPStatusCodesTable_create_row( netsnmp_index* );
 
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /** OPENSERSIPSTATUSCODESTABLE_H */
+#endif /** KAMAILIOSIPSTATUSCODESTABLE_H */

modules_k/snmpstats/snmpstats.c

@@ -49,7 +49,7 @@
  * 4) mod_init() will initialize some interprocess communication buffers, as
  *    well as callback mechanisms for the usrloc module.  To understand what the
  *    interprocess buffer and callbacks are and are for, please see the comments
- *    at the beginning of openserSIPRegUserTable.c
+ *    at the beginning of kamailioSIPRegUserTable.c
  */
 
 /*!
@@ -62,7 +62,7 @@
 /*!
  * \defgroup snmpstats SNMPSTATS :: The Kamailio snmpstats Module
  *
- * The SNMPStats module provides an SNMP management interface to OpenSER.
+ * The SNMPStats module provides an SNMP management interface to Kamailio.
  * Specifically, it provides general SNMP queryable scalar statistics, table
  * representations of more complicated data such as user and contact information,
  * and alarm monitoring capabilities.
@@ -338,7 +338,7 @@ static int mod_init(void)
 					" with the usrloc module\n");
 			LM_ERR("Are you sure that the usrloc module was loaded"
 					" before the snmpstats module in ");
-			LM_ERR("kamailio.cfg?  openserSIPRegUserTable will not be "
+			LM_ERR("kamailio.cfg?  kamailioSIPRegUserTable will not be "
 				   "updated.");
 			*/
 		}
@@ -445,7 +445,7 @@ static void sigchld_handler(int signal)
 /*!
  * This function will spawn a child that retrieves the sysUpTime and stores the
  * result in a file. This file will be read by the AgentX Sub-agent process to
- * supply the openserSIPServiceStartTime time. This function never returns,
+ * supply the kamailioSIPServiceStartTime time. This function never returns,
  * but it will generated a SIGCHLD when it terminates.  There must a SIGCHLD
  * handler to ignore the SIGCHLD for only this process. (See sigchld_handler
  * above).
@@ -539,7 +539,7 @@ static int spawn_sysUpTime_child(void)
 	if (full_path_to_snmpget == NULL) 
 	{
 		LM_ERR("Ran out of memory while trying to retrieve sysUpTime.  ");
-		LM_ERR( "                  openserSIPServiceStartTime is "
+		LM_ERR( "                  kamailioSIPServiceStartTime is "
 				"defaulting to zero\n");
 		return -1;
 	}
@@ -555,7 +555,7 @@ static int spawn_sysUpTime_child(void)
 	if (execve(full_path_to_snmpget, args, NULL) == -1) {
 		LM_ERR( "snmpget failed to run.  Did you supply the snmpstats module"
 				" with a proper snmpgetPath parameter? The "
-				"openserSIPServiceStartTime is defaulting to zero\n");
+				"kamailioSIPServiceStartTime is defaulting to zero\n");
 		close(snmpget_fd);
 		free(full_path_to_snmpget);
 		exit(-1);

modules_k/snmpstats/snmpstats.h

@@ -51,8 +51,8 @@
  * 4) mod_init() will initialize some interprocess communication buffers, as
  *    well as callback mechanisms for the usrloc module.  To understand what the
  *    interprocess buffer and callbacks are and are for, please see the
- *    respective comments in interprocess_buffer.h, openserSIPRegUserTable.h,
- *    and openserSIPContactTable.h.
+ *    respective comments in interprocess_buffer.h, kamailioSIPRegUserTable.h,
+ *    and kamailioSIPContactTable.h.
  */
 
 /*!

modules_k/snmpstats/snmpstats_globals.h

@@ -41,7 +41,7 @@
 
 #include "../../sr_module.h"
 
-#define OPENSER_OID            1,3,6,1,4,1,34352
+#define KAMAILIO_OID            1,3,6,1,4,1,34352
 
 /***************************************************************
  * Textual Conventions for BITS types - begins
@@ -125,7 +125,7 @@
 #define TC_TRUE  1
 #define TC_FALSE 2
 
-#define SNMPGET_TEMP_FILE "/tmp/openSER_SNMPAgent.txt"
+#define SNMPGET_TEMP_FILE "/tmp/kamailio_SNMPAgent.txt"
 #define SNMPGET_MAX_BUFFER 80
 #define MAX_PROC_BUFFER    256
 

modules_k/snmpstats/sub_agent.c

@@ -94,18 +94,18 @@ static int initialize_agentx(void)
 	
 	/* Initialize all scalars, and let the master agent know we want to
 	 * handle all OID's pertaining to these scalars. */
-	init_openserSIPCommonObjects();
-	init_openserSIPServerObjects();
-	init_openserObjects();
+	init_kamailioSIPCommonObjects();
+	init_kamailioSIPServerObjects();
+	init_kamailioObjects();
 
 	/* Initialiaze all the tables, and let the master agent know we want to
 	 * handle all the OID's pertaining to these tables */
-	init_openserSIPPortTable();
-	init_openserSIPMethodSupportedTable();
-	init_openserSIPStatusCodesTable();
-	init_openserSIPRegUserTable();
-	init_openserSIPContactTable();
-	init_openserSIPRegUserLookupTable();
+	init_kamailioSIPPortTable();
+	init_kamailioSIPMethodSupportedTable();
+	init_kamailioSIPStatusCodesTable();
+	init_kamailioSIPRegUserTable();
+	init_kamailioSIPContactTable();
+	init_kamailioSIPRegUserLookupTable();
 
 	/* In case we recevie a request to stop (kill -TERM or kill -INT) */
 	keep_running = 1;
@@ -125,7 +125,7 @@ static int initialize_agentx(void)
 }
 
 /*! Creates a child that will become the AgentX sub-agent.  The child will
- * insulate itself from the rest of OpenSER by overriding most of signal
+ * insulate itself from the rest of Kamailio by overriding most of signal
  * handlers. */
 void agentx_child(int rank)
 {
@@ -139,8 +139,8 @@ void agentx_child(int rank)
 	new_sigterm_handler.sa_handler = sigterm_handler;
 	sigaction(SIGTERM, &new_sigterm_handler, NULL);
 
-	/* We don't want OpenSER's normal handlers doing anything when
-	 * we die.  As far as OpenSER knows this process never existed.
+	/* We don't want Kamailio's normal handlers doing anything when
+	 * we die.  As far as Kamailio knows this process never existed.
 	 * So override all signal handlers to the OS default. */
 	sigemptyset(&default_handlers.sa_mask);
 	default_handlers.sa_flags = 0;

modules_k/snmpstats/sub_agent.h

@@ -43,7 +43,7 @@
 #define AGENT_PROCESS_NAME   "snmpstats_sub_agent"
 
 /*! Run the AgentX sub-agent as a separate process.  The child will
- * insulate itself from the rest of OpenSER by overriding most of signal
+ * insulate itself from the rest of Kamailio by overriding most of signal
  * handlers. */
 void agentx_child(int rank);
 

modules_k/snmpstats/utilities.c

@@ -49,7 +49,7 @@
 #include "../../lib/kcore/kstats_wrapper.h"
 
 /*!
- * This function copies an OpenSER "str" datatype into a '\\0' terminated char*
+ * This function copies an Kamailio "str" datatype into a '\\0' terminated char*
  * string. 
  *
  * \note Make sure to free the memory allocated to *copiedString, when you no

modules_k/snmpstats/utilities.h

@@ -47,7 +47,7 @@
 #include "../../sr_module.h"
 
 /*!
- * This function copies an OpenSER "str" datatype into a '\\0' terminated char*
+ * This function copies an Kamailio "str" datatype into a '\\0' terminated char*
  * string. 
  *
  * \note Make sure to free the memory allocated to *copiedString, when you no