Snom patch: Last_ keywords extension

include/call.hpp

@@ -291,7 +291,8 @@ class call : virtual public task, virtual public listener, public virtual socket
 
     char * get_header_field_code(const char * msg, const char * code);
     char * get_last_header(const char * name);
-    char * get_last_request_uri();
+    char * get_last_tag (const char *name);
+    char * get_last_request_uri(const char *name);
     unsigned long hash(const char * msg);
 
     typedef std::map <std::string, int> file_line_map;

regress/github-#0260/run

@@ -0,0 +1,35 @@
+#!/bin/sh
+# This regression test is a part of SIPp.
+# Author: Pietro Bertera, Snom Technology AG, 2016
+
+. "`dirname "$0"`/../functions"; init
+
+sippbg -m 1 -sf uas.xml -p 5070 -i 127.0.0.1 \
+    -timeout 4 -timeout_error -trace_logs \
+    -log_file log.log >/dev/null 2>&1
+
+job=$!
+
+sippfg -m 1 -sf uac.xml 127.0.0.1:5070 \
+    -timeout 4 -timeout_error >/dev/null 2>&1
+
+status=$?
+wait $job || status=1
+
+if test $status -eq 0; then
+    if grep -e ^LAST\ From:\ \"Tom\ Jones\"\ \<sip:tom.jones@wales.uk\>\;tag=SIPpTag001$ log.log > /dev/null; then
+        if grep -e ^LAST\ To:uri:\ sip:cheese@paris.fr$ log.log > /dev/null; then
+            if grep -e ^LAST\ From-tag:\ SIPpTag001$ log.log > /dev/null; then
+                ok
+            else
+                fail "From:param.tag not found"
+            fi
+        else
+            fail "To:uri not found"
+        fi
+    else
+        fail "From header not found"
+    fi
+else
+    fail "process failure"
+fi

regress/github-#0260/uac.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+<scenario>
+  <send retrans="500" start_txn="invite">
+    <![CDATA[
+
+      INVITE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=justafake
+      From: "Tom Jones" <sip:tom.jones@wales.uk>;tag=SIPpTag00[call_number]
+      To: "Fromage" <sip:cheese@paris.fr>
+      Call-ID: [call_id]
+      CSeq: 1 INVITE
+      Contact: <sip:sipp@[local_ip]:[local_port]>
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv response="200" response_txn="invite" rrs="true"/>
+
+  <send retrans="500" ack_txn="invite">
+    <![CDATA[
+
+      ACK [next_url] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=justafake
+      From: "Tom Jones" <sip:tom.jones@wales.uk>;tag=SIPpTag00[call_number]
+      To: "Fromage" <sip:cheese@paris.fr>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 1 ACK
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv request="BYE"/>
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <timewait milliseconds="500"/>
+</scenario>

regress/github-#0260/uas.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+<scenario>
+  <recv request="INVITE"/>
+
+  <send retrans="500">
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      Via: [last_Via:value]
+      From: [last_From:value]
+      To: [last_To:value];tag=[pid]SIPpTag00[call_number]
+      Call-ID: [last_Call-ID:value]
+      CSeq: [last_CSeq:value]
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv request="ACK" rrs="true">
+    <action>
+      <log message="LAST Contact: [last_Contact]" />
+      <log message="LAST Via: [last_Via:value]"/>
+      <log message="LAST From: [last_From:value]"/>
+      <log message="LAST To: [last_To:value]"/>
+      <log message="LAST To:uri: [last_To:uri]"/>
+      <log message="LAST Contact:uri: [last_Contact:uri]"/>
+      <log message="LAST From-tag: [last_From:param.tag]"/>
+    </action>
+  </recv>
+
+  <send retrans="500">
+    <![CDATA[
+
+      BYE [next_url] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: [last_To:value]
+      To: [last_From:value]
+      Call-ID: [call_id]
+      CSeq: 2 BYE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv response="200"/>
+
+  <timewait milliseconds="500"/>  
+</scenario>

src/call.cpp

@@ -923,33 +923,72 @@ char * call::get_last_header(const char * name)
     if (name[len - 1] == ':') {
         return get_header(last_recv_msg, name, false);
     } else {
+
         char with_colon[MAX_HEADER_LEN];
-        sprintf(with_colon, "%s:", name);
-        return get_header(last_recv_msg, with_colon, false);
+        const char *sep = strrchr(name, ':');
+
+        if (!sep){
+            sprintf(with_colon, "%s:", name);
+            return get_header(last_recv_msg, with_colon, false);
+        } else {
+            if (!strcmp(sep, ":value")) {
+                snprintf(with_colon, len - 4, "%s", name);
+                return get_header(last_recv_msg, with_colon, true);
+            }
+            if (!strcmp(sep, ":uri")) {
+                snprintf(with_colon, len - 2, "%s", name);
+                char * last_header_uri = get_last_request_uri(with_colon);
+                char * ret;
+                if (!(ret = (char *)malloc(strlen(last_header_uri + 1)))){
+                    ERROR("call::get_last_header: Cannot allocate uri !\n");
+                }
+                sprintf(ret, "%s", last_header_uri);
+                free(last_header_uri);
+                return ret;
+            }
+            if (!strcmp(sep, ":param.tag")) {
+                snprintf(with_colon, len - 8, "%s", name);
+                char * last_tag = get_last_tag(with_colon);
+                char * ret;
+                if (!(ret = (char *)malloc(strlen(last_tag + 1)))){
+                    ERROR("call::get_last_header: Cannot allocate param.tag !\n");
+                }
+                sprintf(ret, "%s", last_tag);
+                free(last_tag);
+                return ret;
+            }
+            ERROR("Token %s not valid in %s", sep, name);
+        }
     }
 }
 
-/* Return the last request URI from the To header. On any error returns the
+/* Return the last request URI from the header. On any error returns the
  * empty string.  The caller must free the result. */
-char * call::get_last_request_uri()
+char * call::get_last_request_uri(const char *name)
 {
     char * tmp;
     char * tmp2;
     char * last_request_uri;
+    char * last_header;
     int tmp_len;
 
-    char * last_To = get_last_header("To:");
-    if (!last_To) {
+    if (!name || !strlen(name)) {
         return strdup("");
     }
 
-    tmp = strchr(last_To, '<');
+    last_header = get_last_header(name);
+
+    if (!last_header) {
+        return strdup("");
+    }
+
+    tmp = strchr(last_header, '<');
     if (!tmp) {
         return strdup("");
     }
     tmp++;
 
-    tmp2 = strchr(last_To, '>');
+    tmp2 = strchr(last_header, '>');
     if (!tmp2) {
         return strdup("");
     }
@@ -972,6 +1011,48 @@ char * call::get_last_request_uri()
     return last_request_uri;
 }
 
+/* Return the last tag from the header line. On any error returns the
+ * empty string.  The caller must free the result. */
+char * call::get_last_tag(const char *name)
+{
+    char * tmp;
+    char * tmp2;
+    char * result;
+    char * last_header;
+    int tmp_len;
+
+    if (!name || !strlen(name)) {
+        return strdup("");
+    }
+
+    last_header = get_last_header(name);
+    if (!last_header) {
+        return strdup("");
+    }
+
+    tmp = strcasestr(last_header, "tag=");
+    if (!tmp) {
+        return strdup("");
+    }
+
+    tmp += strlen("tag=");
+    tmp2 = tmp;
+
+    while (*tmp2 && *tmp2 != ';' && *tmp2!='\r' && *tmp2!='\n') tmp2++;
+
+    tmp_len = strlen(tmp) - strlen(tmp2);
+    if (tmp_len < 0) {
+        return strdup("");
+    }
+    if(!(result = (char *) malloc(tmp_len+1))) ERROR("call::get_last_tag: Cannot allocate !\n");
+    memset(result, 0, sizeof(&result));
+    if(tmp && (tmp_len > 0)){
+        strncpy(result, tmp, tmp_len);
+    }
+    result[tmp_len] = '\0';
+    return result;
+}
+
 char * call::send_scene(int index, int *send_status, int *len)
 {
 #define MAX_MSG_NAME_SIZE 30
@@ -2201,7 +2282,7 @@ char* call::createSendingMessage(SendingMessage *src, int P_index, char *msg_buf
             }
             break;
         case E_Message_Last_Request_URI: {
-            char * last_request_uri = get_last_request_uri();
+            char * last_request_uri = get_last_request_uri("To:");
             dest += sprintf(dest, "%s", last_request_uri);
             free(last_request_uri);
             break;