drachtio-srf 4.5.13 → 4.5.16

package/lib/drachtio-agent.js

@@ -536,7 +536,7 @@ class DrachtioAgent extends Emitter {
     debugSocket(`_initServer: removed socket: ${sockPort(socket)}, count now: ${this.mapServer.size}`);
   }
 
-  _onMsg(socket, msg) {
+  _onMsg(socket, msg, {length, start, fullMsg}) {
     const obj = this.mapServer.get(socket) ;
     const pos = msg.indexOf(CR) ;
     const leader = -1 === pos ? msg : msg.slice(0, pos) ;
@@ -751,6 +751,8 @@ class DrachtioAgent extends Emitter {
         break ;
 
       default:
+        console.log(`invalid or garbage message: '${msg}'`) ;
+        console.log(`buffer start ${start}, length ${length}: '${fullMsg}'`);
         throw new Error('unexpected message with type: ' + token[1]) ;
     }
   }

package/lib/sip-parser/message.js

@@ -86,7 +86,12 @@ class SipMessage {
 
   getParsedHeader(hdr) {
     const name = parser.getHeaderName(hdr) ;
-    const v =  this.headers[name] ;
+    const v =  this.headers[name];
+
+    if (!v) {
+      throw new Error('header not available');
+    }
+
     const fn = parser.getParser(hdr.toLowerCase()) ;
     return fn({s:v, i:0}) ;
   }

package/lib/srf.js

@@ -821,7 +821,7 @@ class Srf extends Emitter {
     if (!(opts.headers.to || opts.headers.To) && !opts.calledNumber) { opts.calledNumber = req.calledNumber; }
 
     opts.localSdp = opts.localSdpB && typeof opts.localSdpB !== 'function' ? opts.localSdpB : req.body ;
-    const is3pcc = !opts.localSdp;
+    const is3pcc = !opts.localSdp || opts.noAck;
     if (is3pcc) opts.noAck = true;
 
     let remoteSdpB, translatedRemoteSdpB ;

package/lib/wire-protocol.js

@@ -267,7 +267,7 @@ module.exports = class WireProtocol extends Emitter {
 
     do {
       const msg = [...obj.incomingMsg].slice(start, start + length).join('');
-      this.emit('msg', socket, msg);
+      this.emit('msg', socket, msg, {length, start, fullMsg: obj.incomingMsg});
       obj.incomingMsg = [...obj.incomingMsg].slice(start + length).join('');
 
       // check for another message

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drachtio-srf",
-  "version": "4.5.13",
+  "version": "4.5.16",
   "description": "drachtio signaling resource framework",
   "main": "lib/srf.js",
   "scripts": {

package/test/unit-tests/parser.js

@@ -40,6 +40,10 @@ describe('Parser', function () {
     msg.set('From', '<sip:daveh@localhost>;tag=1234');
     msg.get('from').should.eql('<sip:daveh@localhost>;tag=1234');
   });
+  it('should not parse a header when not available', function () {
+    var msg = new SipMessage();
+    should.throws(msg.getParsedHeader.bind(msg, 'contact'));
+  });
   it('should parse multiple headers into an array', function () {
     var msg = new SipMessage(examples('invite'));
     var via = msg.getParsedHeader('via');
@@ -146,5 +150,11 @@ describe('Parser', function () {
     msg.get('From').should.eql('"Dave" <sip:daveh@localhost>;tag=1234');
     msg.callingName.should.eql('Dave');
   });
+  it('should parse calling name', function () {
+    var msg = new SipMessage();
+    msg.set('From', '"Dave" <sip:daveh@localhost>;tag=1234');
+    msg.get('From').should.eql('"Dave" <sip:daveh@localhost>;tag=1234');
+    msg.callingName.should.eql('Dave');
+  });
 });