From d951caeb8d1002c47b1a88a37de49b34b683652d Mon Sep 17 00:00:00 2001
From: Kirill Solomko <ksolomko@sipwise.com>
Date: Tue, 12 Sep 2017 12:28:14 +0200
Subject: [PATCH] TT#20339 fix mwi.sip CR+LF

    - fix CR+LF in mwi.sip
    - adjust vmnotify content-length calculation

Change-Id: I9d082054ae32566ed99afbb44896f02decffdcf0
---
 mwi.sip  | 26 +++++++++++++++-----------
 vmnotify |  5 +++--
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/mwi.sip b/mwi.sip
index b42ffb2..a399008 100644
--- a/mwi.sip
+++ b/mwi.sip
@@ -1,11 +1,15 @@
-NOTIFY sip:$user$@$dsthost$;transport=UDP SIP/2.0
-To: <sip:$MBID$@$dsthost$>
-From: <sip:voicebox@voip.sipwise.local>;tag=4711
-CSeq: 1 NOTIFY
-Call-Id: $CALL_ID$
-Event: message-summary
-Content-Type: application/simple-message-summary
-Content-Length: $BODYLEN$
-
-$BODY_MW$
-$BODY_VM$
+NOTIFY sip:$user$@$dsthost$;transport=UDP SIP/2.0
+Via: SIP/2.0/UDP 127.0.0.1:5081;branch=$BRANCH$;rport;alias'
+To: <sip:$MBID$@$dsthost$>
+From: <sip:voicebox@voicebox.sipwise.local>;tag=4711
+CSeq: 1 NOTIFY
+Call-Id: $CALL_ID$
+Contact: <sip:voicebox@127.0.0.1:5070>
+Event: message-summary
+User-Agent: Sipwise NGCP Application Server 5.X
+Content-Type: application/simple-message-summary
+Content-Length: $BODYLEN$
+
+$BODY_MW$
+$BODY_VM$
+
diff --git a/vmnotify b/vmnotify
index 584d311..b40a0fa 100755
--- a/vmnotify
+++ b/vmnotify
@@ -133,9 +133,10 @@ EOF
         dsthost => $CONFIG{SERVER},
 
     );
-    $macros{bodylen} = length($macros{body_mw})+2+length($macros{body_vm})+2;
 
-    map { $mwi =~ s/\$$_\$/$macros{$_}/mgi; } keys %macros;
+    $macros{bodylen} = 2+length($macros{body_mw})+2+length($macros{body_vm})+2;
+
+    map { $mwi =~ s/\$$_\$/$macros{$_}/gi; } keys %macros;
 
     my $sock = IO::Socket::INET->new(PeerAddr => $CONFIG{SERVER},
                                      LocalAddr => $CONFIG{LOCAL_IP},