[sr-dev] git:master: snmpstats Align transports to RFC 4780

[Olle E. Johansson]

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

Author: Olle E. Johansson <oej at edvina.net>
Committer: Olle E. Johansson <oej at edvina.net>
Date:   Thu Apr  4 21:57:31 2013 +0200

snmpstats Align transports to RFC 4780

---

 modules/snmpstats/mibs/KAMAILIO-SIP-COMMON-MIB |   10 ++++++++--
 modules/snmpstats/snmpstats_globals.h          |    8 ++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/modules/snmpstats/mibs/KAMAILIO-SIP-COMMON-MIB b/modules/snmpstats/mibs/KAMAILIO-SIP-COMMON-MIB
index 86dd8d2..939a1a7 100644
--- a/modules/snmpstats/mibs/KAMAILIO-SIP-COMMON-MIB
+++ b/modules/snmpstats/mibs/KAMAILIO-SIP-COMMON-MIB
@@ -331,8 +331,14 @@ KAMAILIO-SIP-COMMON-MIB DEFINITIONS ::= BEGIN
              transport protocol is currently not being used. 
 	     
              The bits are assigned as follows:
-             
-             other(0), udp(1), tcp(2), sctp(3), tls(4)"
+		bit 0: a protocol other than those defined here
+       		bit 1: User Datagram Protocol
+       		bit 2: Transmission Control Protocol
+       		bit 3: Stream Control Transmission Protocol
+       		bit 4: Transport Layer Security Protocol over TCP
+       		bit 5: Transport Layer Security Protocol over SCTP
+       		bit 6: WebSocket transport
+       		bit 7: WebSocket transport over HTTP/TLS (WSS)
        ::= { kamailioSIPPortEntry 4 }
 
    --
diff --git a/modules/snmpstats/snmpstats_globals.h b/modules/snmpstats/snmpstats_globals.h
index 470c38f..431e907 100644
--- a/modules/snmpstats/snmpstats_globals.h
+++ b/modules/snmpstats/snmpstats_globals.h
@@ -64,6 +64,9 @@
 #define TC_SIP_TRANSPORT_PROTOCOL_TCP   (128>>2)
 #define TC_SIP_TRANSPORT_PROTOCOL_SCTP  (128>>3)
 #define TC_SIP_TRANSPORT_PROTOCOL_TLS   (128>>4)
+#define TC_SIP_TRANSPORT_PROTOCOL_SCTP_TLS   (128>>5)
+#define TC_SIP_TRANSPORT_PROTOCOL_WS    (128 >> 6)
+#define TC_SIP_TRANSPORT_PROTOCOL_WSS   (128 >> 7)
 
 #define TC_SIP_ENTITY_ROLE_OTHER            (128 >> 0)
 #define TC_SIP_ENTITY_ROLE_USER_AGENT       (128 >> 1)
@@ -88,8 +91,9 @@
 #define TC_TRANSPORT_PROTOCOL_TCP   (128 >> 2)
 #define TC_TRANSPORT_PROTOCOL_SCTP  (128 >> 3)
 #define TC_TRANSPORT_PROTOCOL_TLS   (128 >> 4)
-#define TC_TRANSPORT_PROTOCOL_WS    (128 >> 5)
-#define TC_TRANSPORT_PROTOCOL_WSS   (128 >> 6)
+#define TC_TRANSPORT_PROTOCOL_SCRTP_TLS   (128 >> 5)
+#define TC_TRANSPORT_PROTOCOL_WS    (128 >> 6)
+#define TC_TRANSPORT_PROTOCOL_WSS   (128 >> 7)
 
 /*
  * Textual Conventions for BITS types - ends