TT#20339 fix mwi.sip CR+LF

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

Change-Id: I9d082054ae32566ed99afbb44896f02decffdcf0

mwi.sip

@@ -1,11 +1,15 @@
-NOTIFY sip:$user$@$dsthost$;transport=UDP SIP/2.0
+NOTIFY sip:$user$@$dsthost$;transport=UDP SIP/2.0
-To: <sip:$MBID$@$dsthost$>
+Via: SIP/2.0/UDP 127.0.0.1:5081;branch=$BRANCH$;rport;alias'
-From: <sip:voicebox@voip.sipwise.local>;tag=4711
+To: <sip:$MBID$@$dsthost$>
-CSeq: 1 NOTIFY
+From: <sip:voicebox@voicebox.sipwise.local>;tag=4711
-Call-Id: $CALL_ID$
+CSeq: 1 NOTIFY
-Event: message-summary
+Call-Id: $CALL_ID$
-Content-Type: application/simple-message-summary
+Contact: <sip:voicebox@127.0.0.1:5070>
-Content-Length: $BODYLEN$
+Event: message-summary
-
+User-Agent: Sipwise NGCP Application Server 5.X
-$BODY_MW$
+Content-Type: application/simple-message-summary
-$BODY_VM$
+Content-Length: $BODYLEN$
+
+$BODY_MW$
+$BODY_VM$
+

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},