Proper WS support in tracing and capturing (Homer)

OpenSIPS · Mar 12, 2015 · f612548 · f612548 · satishdotpatel · Mar 12, 2015
1 parent 73f5a23
commit f612548
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c
@@ -709,8 +709,11 @@ int hep_msg_received(int sockfd, struct receive_info *ri, str *msg, void* param)
         /* PROTO */
         if(heph->hp_p == IPPROTO_UDP) ri->proto=PROTO_UDP;
         else if(heph->hp_p == IPPROTO_TCP) ri->proto=PROTO_TCP;
-        else if(heph->hp_p == IPPROTO_IDP) ri->proto=PROTO_TLS; /* fake protocol */
+        else if(heph->hp_p == IPPROTO_IDP) ri->proto=PROTO_TLS;
+                                            /* fake protocol */
         else if(heph->hp_p == IPPROTO_SCTP) ri->proto=PROTO_SCTP;
+        else if(heph->hp_p == IPPROTO_ESP) ri->proto=PROTO_WS;
+                                            /* fake protocol */
         else {
         	LM_ERR("unknow protocol [%d]\n",heph->hp_p);
                 ri->proto = PROTO_NONE;

diff --git a/modules/siptrace/siptrace.c b/modules/siptrace/siptrace.c
@@ -1961,10 +1961,12 @@ static int pipport2su (str *sproto, str *ip, unsigned short port,
 	/*parse protocol */
 	if(strncmp(sproto->s, "udp",3) == 0) *proto = IPPROTO_UDP;
 	else if(strncmp(sproto->s, "tcp",3) == 0) *proto = IPPROTO_TCP;
-	else if(strncmp(sproto->s, "tls",3) == 0) *proto = IPPROTO_IDP; /* fake proto type */
+	else if(strncmp(sproto->s, "tls",3) == 0) *proto = IPPROTO_IDP;
+												/* fake proto type */
 	else if(strncmp(sproto->s, "sctp",4) == 0) *proto = IPPROTO_SCTP;
 	else if(strncmp(sproto->s, "any",3) == 0) *proto = IPPROTO_UDP;
-	else if(strncmp(sproto->s, "ws",2) == 0) *proto = IPPROTO_IDP; /* fake proto type */
+	else if(strncmp(sproto->s, "ws",2) == 0) *proto = IPPROTO_ESP;
+												/* fake proto type */
 	else {
 		LM_ERR("bad protocol %.*s\n", sproto->len, sproto->s);
 		return -1;