@babblevoice/projectrtp 2.4.17 → 2.5.22

package/README.md

@@ -54,82 +54,15 @@ The folder is separated out into interface, unit and mock. The mock folder conta
 
 These are designed to create real world scenarios - opening and closing multiple channels and random times and at load. This is designed to test for unexpected behaviour. These test do not provide a pass/fail - but might crash or produce unexpected output on bad behaviour. These have concurrency/race condition tests in mind.
 
-### `npm run check`
-
-Use tsc for type checking and eslint.
-
-NB: tsc should be installed as a global module:
-
-```bash
-npm install -G typescript
-```
-
-Eslint should be installed as a module
-
-```bash
-npm install eslint
-```
+### Local build
 
-Other types modules need installing:
+If you wish to build outsode of a Docker image, there are npm target scripts for build and rebuild. For beta releases the following can be done.
 
 ```bash
-npm i --save-dev @types/node @types/mocha @types/chai @types/uuid
-```
-
-## Dependencies
-
-* spandsp-devel
-* libilbc
-* boost
-* gnutls
-* libsrtp
-* openssl (for now the NodeJS scripts use openssl to generate a self signed cert for DTLS)
-
-libilbc is included as a git submodule and requires building. This needs pulling which also
-has a submodule so (although this is handled inteh Dockerfile if you are building an image): 
-
-```
-git submodule update --init --recursive
-```
-
-## Docker/Podman
-
-Podman has some shortfalls. Remove and install docker.
-
-```
-docker build .
-```
-
-### Multi arch targets
-
-Qemu emulators are needed
-
-```
-docker run -it --rm --privileged tonistiigi/binfmt --install all
-```
-
-Or in one shot and build it. This create a docker image and container buildkit. 
-```
-docker buildx create --name rtpbuilder --use --bootstrap --platform linux/amd64,linux/arm64
-```
-
-To clean up if you want to remove this buildx env:
-```
-docker buildx rm rtpbuilder
-```
-
-Then to build, and push to Docker hub (REMEMBER to update all references to version number including in Dockerfile)
-```
 docker buildx prune
-docker buildx build --platform linux/amd64,linux/arm64 -t tinpotnick/projectrtp:<version> . --push
+docker buildx build --platform linux/amd64,linux/arm64 -t tinpotnick/projectrtp:2.4.20_beta1 . --push
 ```
 
-NB: updating version, Docker file, this readme and package.json all need updating - is there a way of automating this?
-
-### Local build
-
-If you wish to build outsode of a Docker image, there are npm target scripts for build and rebuild.
-
 ## Example scripts
 
 The examples folder contains two scripts which use this library. The simplenode can be used where no special functionality is required. The standard projectrtp docker image points to this - so starting a docker instance will run up as a node and attempt to connect to a central control server.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babblevoice/projectrtp",
-  "version": "2.4.17",
+  "version": "2.5.22",
   "description": "A scalable Node addon RTP server",
   "main": "index.js",
   "directories": {
@@ -43,13 +43,15 @@
     "WebRTC"
   ],
   "devDependencies": {
-    "@types/node": "^12.20.55",
     "@types/chai": "^4.3.4",
     "@types/mocha": "^10.0.1",
+    "@types/node": "^12.20.55",
     "@types/uuid": "^9.0.0",
     "chai": "^4.3.7",
-    "mocha": "^10.2.0",
     "eslint": "^8.29.0",
-    "jsdoc": "^4.0.0"
+    "fft-js": "^0.0.12",
+    "jsdoc": "^4.0.0",
+    "mocha": "^10.2.0",
+    "nodeplotlib": "^0.7.7"
   }
 }

package/src/globals.h

@@ -9,6 +9,9 @@
 #define G711PAYLOADBYTES 160
 #define G722PAYLOADBYTES 160
 #define L16PAYLOADSAMPLES 160
+#define G711PAYLOADSAMPLES 160
+#define G722PAYLOADSAMPLES 160
+#define L1616PAYLOADSAMPLES 320
 #define L16NARROWBANDBYTES 320
 #define L16WIDEBANDBYTES 640
 #define ILBC20PAYLOADBYTES 38
@@ -17,6 +20,8 @@
 #define PCMUPAYLOADTYPE 0
 #define PCMAPAYLOADTYPE 8
 #define G722PAYLOADTYPE 9
+/* defaults for our supported dynamic payload types */
+#define RFC2833PAYLOADTYPE 101
 #define ILBCPAYLOADTYPE 97
 /* Only use this value for internal use and must not clash with the types above */
 #define L168KPAYLOADTYPE 11

package/src/projectrtpbuffer.cpp

@@ -1,4 +1,7 @@
 
+#include <iostream>
+#include <cstdlib>
+
 #include "projectrtpbuffer.h"
 #include "globals.h"
 
@@ -23,7 +26,10 @@ rtpbuffer::rtpbuffer( int buffercount, int waterlevel ) :
   buffercount( buffercount ),
   waterlevel( waterlevel ),
   outsn( 0 ),
-  dropped( 0 ) {
+  dropped( 0 ),
+  pushed( 0 ),
+  popped( 0 ),
+  badsn( 0 ) {
 
   this->buffer.resize( buffercount );
   this->orderedrtpdata.resize( buffercount );
@@ -46,7 +52,8 @@ Returns the next packet in order - does not modify our structure.
 */
 rtppacket* rtpbuffer::peek( void ) {
   if( nullptr != this->peekedpopped ) return this->peekedpopped;
-  this->peekedpopped = this->orderedrtpdata.at( this->outsn % this->buffercount );
+  uint16_t bufindex = this->outsn % this->buffercount;
+  this->peekedpopped = this->orderedrtpdata.at( bufindex );
   return this->peekedpopped;
 }
 
@@ -80,12 +87,19 @@ rtppacket* rtpbuffer::pop( void ) {
   this->peekedpopped = nullptr;
   if( nullptr == out ) return nullptr;
 
-  if( nullptr != this->orderedrtpdata.at( oldsn % this->buffercount ) ) {
-    this->orderedrtpdata.at( oldsn % this->buffercount ) = nullptr;
+  uint16_t bufindex = oldsn % this->buffercount;
+  if( nullptr != this->orderedrtpdata.at( bufindex ) ) {
+    this->orderedrtpdata.at( bufindex ) = nullptr;
     this->availablertpdata.push( out );
   }
 
-  if( out->getsequencenumber() != oldsn ) return nullptr;
+  auto outsn = out->getsequencenumber();
+  if( outsn != oldsn ) {
+    this->badsn++;
+    return nullptr;
+  }
+
+  this->popped++;
   return out;
 }
 
@@ -94,7 +108,12 @@ Stores the last reserved packet.
 */
 void rtpbuffer::push( void ) {
 
-  if( nullptr == this->reserved ) return;
+  if( nullptr == this->reserved ) {
+    fprintf( stderr, "Push on buffer - but no buffer reserved to push\n" );
+    this->dropped++;
+    return;
+  }
+
   uint16_t sn = this->reserved->getsequencenumber();
 
   /*
@@ -117,6 +136,11 @@ void rtpbuffer::push( void ) {
 
   if( nullptr == this->orderedrtpdata.at( sn % this->buffercount ) ) {
     this->orderedrtpdata.at( sn % this->buffercount ) = this->reserved;
+    this->pushed++;
+  } else {
+    /* this shouldn't happen as it means a duplicate sn or we have got our index incorrect */
+    this->availablertpdata.push( this->reserved );
+    this->dropped++;
   }
 
   this->reserved = nullptr;

package/src/projectrtpbuffer.h

@@ -10,13 +10,17 @@
 #include "projectrtppacket.h"
 
 /* Defaults */
-/* The number of packets we will keep in a buffer */
-#define BUFFERPACKETCOUNT 40
+/* 
+  The number of packets we will keep in a buffer 
+  MUST BE POWER OF 2 or the mod won't work on the 
+  circular buffer when wrapping around the uint16.
+*/
+#define BUFFERPACKETCOUNT 32
 /* 
   How many packets we receive before we start taking packets out of the buffer 
   If we fill, Delay = ( BUFFERPACKETCOUNT - BUFFERPACKETCAP ) * 20mS 
 */
-#define BUFFERPACKETCAP 15  /* 200mS @ a ptime of 20mS */
+#define BUFFERPACKETCAP 10  /* 200mS @ a ptime of 20mS */
 
 /*
 My thoughts on buffers. We reorder as we might want to use the data
@@ -49,6 +53,10 @@ public:
   void push( void );
   rtppacket* reserve( void );
   uint64_t getdropped( void ) { return this->dropped; }
+  uint64_t getpushed( void ) { return this->pushed; }
+  uint64_t getpopped( void ) { return this->popped; }
+  uint64_t getbadsn( void ) { return this->badsn; }
+  uint16_t getoutsn( void ) { return this->outsn; }
 
   int size( void ) { return this->buffercount; }
 
@@ -76,6 +84,9 @@ private:
   int waterlevel;
   uint16_t outsn;
   uint64_t dropped;
+  uint64_t pushed;
+  uint64_t popped;
+  uint64_t badsn;
 };
 
 #ifdef TESTSUITE

package/src/projectrtpchannel.cpp

@@ -53,8 +53,10 @@ projectrtpchannel::projectrtpchannel( unsigned short port ):
   totalticktime( 0 ),
   totaltickcount( 0 ),
   tickswithnortpcount( 0 ),
+  outpkwritecount( 0 ),
   outpkcount( 0 ),
   outpkskipcount( 0 ),
+  outpkdropcount( 0 ),
   inbuff( rtpbuffer::create() ),
   rtpbufferlock( false ),
   rtpoutindex( 0 ),
@@ -66,7 +68,8 @@ projectrtpchannel::projectrtpchannel( unsigned short port ):
   /* private */
   active( false ),
   port( port ),
-  rfc2833pt( 101 ),
+  rfc2833pt( RFC2833PAYLOADTYPE ),
+  ilbcpt( ILBCPAYLOADTYPE ),
   lasttelephoneeventsn( 0 ),
   lasttelephoneevent( 0 ),
   resolver( workercontext ),
@@ -133,6 +136,8 @@ void projectrtpchannel::requestclose( std::string reason ) {
 void projectrtpchannel::remote( std::string address,
                                 unsigned short port,
                                 uint32_t codec,
+                                unsigned short ilbcpt,
+                                unsigned short rfc2833pt,
                                 dtlssession::mode m,
                                 std::string fingerprint ) {
 
@@ -162,6 +167,8 @@ void projectrtpchannel::remote( std::string address,
   }
 
   this->codec = codec;
+  this->rfc2833pt = rfc2833pt;
+  this->ilbcpt = ilbcpt;
 
   if( changed ) {
     if( dtlssession::none != m ) {
@@ -410,13 +417,17 @@ void projectrtpchannel::handletick( const boost::system::error_code& error ) {
   this->startticktimer();
 
   this->incrtsout();
-  if( this->checkidlerecv() ) return;
+
+  if( this->checkidlerecv() ) {
+    this->endticktimer();
+    return;
+  }
+
   this->checkfornewrecorders();
 
   this->incodec << codecx::next;
   this->outcodec << codecx::next;
 
-
   rtppacket *src;
   do {
     AQUIRESPINLOCK( this->rtpbufferlock );
@@ -827,6 +838,7 @@ void projectrtpchannel::readsomertp( void ) {
   RELEASESPINLOCK( this->rtpbufferlock );
 
   if( nullptr == buf ) {
+    fprintf( stderr, "Error no buffer\n" );
     this->requestclose( "error.nobuffer" );
     return;
   }
@@ -835,15 +847,16 @@ void projectrtpchannel::readsomertp( void ) {
   boost::asio::buffer( buf->pk, RTPMAXLENGTH  ), this->rtpsenderendpoint,
     [ this, buf ]( boost::system::error_code ec, std::size_t bytesrecvd ) {
 
-      if( ec ) return;
+      if ( ec && ec != boost::asio::error::message_size ) return;
+      this->receivedpkcount++;
+
       if( !this->active || this->_requestclose ) return;
 
       if ( bytesrecvd > 0 && bytesrecvd <= RTPMAXLENGTH ) {
+        buf->length = bytesrecvd;
 
-        if( this->handlestun( buf->pk, bytesrecvd ) ) {
-          this->readsomertp();
-          return;
-        }
+        if( this->handlestun( buf->pk, bytesrecvd ) )
+          goto readsomemore;
 
         AQUIRESPINLOCK( this->rtpdtlslock );
         dtlssession::pointer currentdtlssession = this->rtpdtls;
@@ -854,20 +867,13 @@ void projectrtpchannel::readsomertp( void ) {
           AQUIRESPINLOCK( this->rtpdtlslock );
           currentdtlssession->write( buf->pk, bytesrecvd );
           RELEASESPINLOCK( this->rtpdtlslock );
-
           this->dtlsnegotiate();
-          this->readsomertp();
-          return;
+          goto readsomemore;
         }
 
-        /* RTP - TODO check for MUXED RTCP */
-        /* We should still count packets we are instructed to drop */
-        this->receivedpkcount++;
-
         if( !this->recv ) {
           this->receivedpkskip++;
-          this->readsomertp();
-          return;
+          goto readsomemore;
         }
 
         this->tickswithnortpcount = 0;
@@ -878,26 +884,28 @@ void projectrtpchannel::readsomertp( void ) {
         if( this->confirmedrtpsenderendpoint != this->rtpsenderendpoint ) {
           /* After the first packet - we only accept data from the verified source */
           this->receivedpkskip++;
-          this->readsomertp();
-          return;
+          goto readsomemore;
         }
 
         if( buf->getssrc() != this->ssrcin ) {
           this->receivedpkskip++;
-          this->readsomertp();
-          return;
+          goto readsomemore;
         }
 
-
-
-        buf->length = bytesrecvd;
+        /* dynamic payload types */
+        auto pt = buf->getpayloadtype();
+        if( pt == this->ilbcpt ) {
+          buf->setpayloadtype( ILBCPAYLOADTYPE );
+        } else if ( pt == this->rfc2833pt ) {
+          buf->setpayloadtype( RFC2833PAYLOADTYPE );
+        }
 
         AQUIRESPINLOCK( this->rtpbufferlock );
         this->inbuff->push();
         RELEASESPINLOCK( this->rtpbufferlock );
-
       }
 
+readsomemore:
       this->readsomertp();
 
     } );
@@ -961,44 +969,46 @@ void projectrtpchannel::writepacket( rtppacket *pk ) {
 
   if( !this->active ) return;
 
+  AQUIRESPINLOCK( this->rtpdtlslock );
+  dtlssession::pointer currentdtlssession = this->rtpdtls;
+  RELEASESPINLOCK( this->rtpdtlslock );
+
+  if( nullptr != currentdtlssession &&
+      currentdtlssession->rtpdtlshandshakeing ) {
+    goto completewrite;
+  }
+
   if( nullptr == pk ) {
-    this->outpkskipcount++;
     fprintf( stderr, "We have been given an nullptr RTP packet??\n" );
-    return;
+    goto completewrite;
   }
 
   if( 0 == pk->length ) {
-    this->outpkskipcount++;
     fprintf( stderr, "We have been given an RTP packet of zero length??\n" );
-    return;
+    goto completewrite;
   }
 
-  if( !this->send ) {
-    this->outpkskipcount++;
-    /* silently drop - could we do this sooner to use less CPU? */
-    return;
-  }
-
-  AQUIRESPINLOCK( this->rtpdtlslock );
-  dtlssession::pointer currentdtlssession = this->rtpdtls;
-  RELEASESPINLOCK( this->rtpdtlslock );
-
-  if( nullptr != currentdtlssession &&
-      currentdtlssession->rtpdtlshandshakeing ) {
-    this->outpkskipcount++;
-    return;
-  }
+  /* silently drop - could we do this sooner to use less CPU? */
+  if( !this->send ) goto completewrite;
 
   if( nullptr != currentdtlssession &&
       !currentdtlssession->rtpdtlshandshakeing ) {
     if( !currentdtlssession->protect( pk ) ) {
-      this->outpkskipcount++;
-      return;
+      goto completewrite;
     }
   }
 
   if( this->remoteconfirmed ) {
     this->snout++;
+    this->outpkwritecount++;
+
+    /* dynamic payload types */
+    auto pt = pk->getpayloadtype();
+    if( pt == ILBCPAYLOADTYPE ) {
+      pk->setpayloadtype( this->ilbcpt );
+    } else if ( pt == RFC2833PAYLOADTYPE ) {
+      pk->setpayloadtype( this->rfc2833pt );
+    }
 
     this->rtpsocket.async_send_to(
                       boost::asio::buffer( pk->pk, pk->length ),
@@ -1009,6 +1019,7 @@ void projectrtpchannel::writepacket( rtppacket *pk ) {
                                     boost::asio::placeholders::bytes_transferred ) );
     return;
   }
+completewrite:
   this->outpkskipcount++;
 }
 
@@ -1037,6 +1048,8 @@ bool projectrtpchannel::mix( projectrtpchannel::pointer other ) {
     other->mixer = this->mixer;
 
     this->mixer->addchannels( shared_from_this(), other );
+
+    this->mixer->go();
   } else {
     /* If we get here this and other are already mixing and should be cleaned up first */
     RELEASESPINLOCK( this->mixerlock );
@@ -1044,11 +1057,6 @@ bool projectrtpchannel::mix( projectrtpchannel::pointer other ) {
     return false;
   }
 
-  this->mixing = true;
-  other->mixing = true;
-
-  this->mixer->go();
-
   RELEASESPINLOCK( this->mixerlock );
 
   postdatabacktojsfromthread( shared_from_this(), "mix", "start" );
@@ -1190,6 +1198,9 @@ void projectrtpchannel::handlesend(
 
   if( !error && bytes_transferred > 0 ) {
     this->outpkcount++;
+  } else {
+    fprintf( stderr, "Problem sending packet\n" );
+    this->outpkdropcount++;
   }
 }
 
@@ -1561,6 +1572,23 @@ static napi_value channelremote( napi_env env, napi_callback_info info ) {
   uint32_t codecval = 0;
   napi_get_value_uint32( env, ncodec, &codecval );
 
+  uint32_t ilbcpt = ILBCPAYLOADTYPE;
+  uint32_t rfc2833pt = RFC2833PAYLOADTYPE;
+
+  bool hasit;
+  napi_value nptval;
+  if( napi_ok == napi_has_named_property( env, argv[ 0 ], "ilbcpt", &hasit ) &&
+      hasit &&
+      napi_ok == napi_get_named_property( env, argv[ 0 ], "ilbcpt", &nptval ) ) {
+    napi_get_value_uint32( env, nptval, &ilbcpt );
+  }
+
+  if( napi_ok == napi_has_named_property( env, argv[ 0 ], "rfc2833pt", &hasit ) &&
+      hasit &&
+      napi_ok == napi_get_named_property( env, argv[ 0 ], "rfc2833pt", &nptval ) ) {
+    napi_get_value_uint32( env, nptval, &rfc2833pt );
+  }
+
   size_t bytescopied;
   char remoteaddress[ 128 ];
 
@@ -1571,7 +1599,6 @@ static napi_value channelremote( napi_env env, napi_callback_info info ) {
 
   /* optional - DTLS */
   napi_value dtls;
-  bool hasit;
   dtlssession::mode dtlsmode = dtlssession::none;
   char vfingerprint[ 128 ];
   vfingerprint[ 0 ] = 0;
@@ -1621,7 +1648,7 @@ static napi_value channelremote( napi_env env, napi_callback_info info ) {
     }
   }
 
-  chan->remote( remoteaddress, remoteport, codecval, dtlsmode, vfingerprint );
+  chan->remote( remoteaddress, remoteport, codecval, ilbcpt, rfc2833pt, dtlsmode, vfingerprint );
 
   return createnapibool( env, true );
 }
@@ -1714,23 +1741,35 @@ napi_value createcloseobject( napi_env env, projectrtpchannel::pointer p ) {
     if( napi_ok != napi_create_double( env, 0.0, &mos ) ) return NULL;
   }
 
-  napi_value receivedpkcount, receivedpkskip, receiveddropped;
+  napi_value receivedpkcount, receivedpkskip, receiveddropped, resceivedpushed, resceivedpopped, bufferbadsn;
   if( napi_ok != napi_create_double( env, p->receivedpkcount, &receivedpkcount ) ) return NULL;
   if( napi_ok != napi_create_double( env, p->receivedpkskip, &receivedpkskip ) ) return NULL;
   if( napi_ok != napi_create_double( env, p->inbuff->getdropped(), &receiveddropped ) ) return NULL;
+  if( napi_ok != napi_create_double( env, p->inbuff->getpopped(), &resceivedpopped ) ) return NULL;
+  if( napi_ok != napi_create_double( env, p->inbuff->getpushed(), &resceivedpushed ) ) return NULL;
+  if( napi_ok != napi_create_double( env, p->inbuff->getbadsn(), &bufferbadsn ) ) return NULL;
 
   if( napi_ok != napi_set_named_property( env, in, "mos", mos ) ) return NULL;
   if( napi_ok != napi_set_named_property( env, in, "count", receivedpkcount ) ) return NULL;
   if( napi_ok != napi_set_named_property( env, in, "dropped", receiveddropped ) ) return NULL;
+  if( napi_ok != napi_set_named_property( env, in, "popped", resceivedpopped ) ) return NULL;
+  if( napi_ok != napi_set_named_property( env, in, "pushed", resceivedpushed ) ) return NULL;
   if( napi_ok != napi_set_named_property( env, in, "skip", receivedpkskip ) ) return NULL;
+  if( napi_ok != napi_set_named_property( env, in, "badsn", bufferbadsn ) ) return NULL;
 
-  napi_value sentpkcount, outpkskipcount;
+  napi_value sentpkcount, outpkskipcount, outdropcount, outwritecount;
   if( napi_ok != napi_create_double( env, p->outpkcount, &sentpkcount ) ) return NULL;
   if( napi_ok != napi_set_named_property( env, out, "count", sentpkcount ) ) return NULL;
 
   if( napi_ok != napi_create_double( env, p->outpkskipcount, &outpkskipcount ) ) return NULL;
   if( napi_ok != napi_set_named_property( env, out, "skip", outpkskipcount ) ) return NULL;
 
+  if( napi_ok != napi_create_double( env, p->outpkdropcount, &outdropcount ) ) return NULL;
+  if( napi_ok != napi_set_named_property( env, out, "drop", outdropcount ) ) return NULL;
+
+  if( napi_ok != napi_create_double( env, p->outpkwritecount, &outwritecount ) ) return NULL;
+  if( napi_ok != napi_set_named_property( env, out, "write", outwritecount ) ) return NULL;
+
   napi_value meanticktimeus, maxticktimeus, totaltickcount;
   if( p->totaltickcount > 0 ) {
     if( napi_ok != napi_create_double( env, ( p->totalticktime / p->totaltickcount ), &meanticktimeus ) ) return NULL;
@@ -1903,6 +1942,8 @@ static napi_value channelcreate( napi_env env, napi_callback_info info ) {
   char vfingerprint[ 128 ];
   vfingerprint[ 0 ] = 0;
   uint32_t codecval = 0;
+  uint32_t ilbcpt = ILBCPAYLOADTYPE;
+  uint32_t rfc2833pt = RFC2833PAYLOADTYPE;
 
   if( napi_ok == napi_has_named_property( env, argv[ 0 ], "remote", &hasit ) &&
       hasit &&
@@ -1975,6 +2016,19 @@ nodtls:
       return NULL;
     }
 
+    napi_value nptval;
+    if( napi_ok == napi_has_named_property( env, nremote, "ilbcpt", &hasit ) &&
+        hasit &&
+        napi_ok == napi_get_named_property( env, nremote, "ilbcpt", &nptval ) ) {
+      napi_get_value_uint32( env, nptval, &ilbcpt );
+    }
+
+    if( napi_ok == napi_has_named_property( env, nremote, "rfc2833pt", &hasit ) &&
+        hasit &&
+        napi_ok == napi_get_named_property( env, nremote, "rfc2833pt", &nptval ) ) {
+      napi_get_value_uint32( env, nptval, &rfc2833pt );
+    }
+
     napi_get_value_uint32( env, ncodec, &codecval );
 
     if( napi_ok != napi_get_named_property( env, nremote, "address", &naddress ) ) {
@@ -2087,7 +2141,7 @@ nodtls:
     return NULL;
   }
 
-  p->remote( remoteaddress, remoteport, codecval, dtlsmode, vfingerprint );
+  p->remote( remoteaddress, remoteport, codecval, ilbcpt, rfc2833pt, dtlsmode, vfingerprint );
   uint32_t ssrc = p->requestopen();
 
   /* methods */

package/src/projectrtpchannel.h

@@ -82,6 +82,8 @@ public:
   void remote( std::string address,
                unsigned short port,
                uint32_t codec,
+               unsigned short ilbcpt,
+               unsigned short rfc2833pt,
                dtlssession::mode,
                std::string fingerprint );
 
@@ -132,8 +134,10 @@ public:
   std::atomic_uint64_t totaltickcount;
   std::atomic_uint16_t tickswithnortpcount;
 
+  std::atomic_uint64_t outpkwritecount;
   std::atomic_uint64_t outpkcount;
   std::atomic_uint64_t outpkskipcount;
+  std::atomic_uint64_t outpkdropcount;
 
   /* buffer and spin lock for in traffic */
   rtpbuffer::pointer inbuff;
@@ -159,6 +163,8 @@ private:
   std::atomic_bool active;
   unsigned short port;
   unsigned short rfc2833pt;
+  unsigned short ilbcpt;
+
   uint32_t lasttelephoneeventsn;
   uint8_t lasttelephoneevent;