call rtpengine offer using callback

2026-10-04 02:04:22 +00:00 · 2022-09-27 16:03:46 +01:00
20 changed files with 3396 additions and 5311 deletions
@@ -2,10 +2,16 @@ name: Docker

 on:
  push:
+    # Publish `master` as Docker `latest` image.
    branches:
      - main
+
+    # Publish `v1.2.3` tags as releases.
    tags:
-      - '*'
+      - v*
+
+env:
+  IMAGE_NAME: sbc-inbound

 jobs:
  push:
@@ -14,41 +20,32 @@ jobs:
    if: github.event_name == 'push'

    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v2

-      - name: prepare tag 
-        id: prepare_tag
+      - name: Build image
+        run: docker build . --file Dockerfile --tag $IMAGE_NAME
+
+      - name: Log into registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Push image
        run: |
-            IMAGE_ID=jambonz/sbc-inbound
+          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME

-            # Strip git ref prefix from version
-            VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+          # Change all uppercase to lowercase
+          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')

-            # Strip "v" prefix from tag name
-            [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')

-            # Use Docker `latest` tag convention
-            [ "$VERSION" == "main" ] && VERSION=latest
+          # Strip "v" prefix from tag name
+          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')

-            echo IMAGE_ID=$IMAGE_ID
-            echo VERSION=$VERSION
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "main" ] && VERSION=latest

-            echo "image_id=$IMAGE_ID" >> $GITHUB_OUTPUT
-            echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo IMAGE_ID=$IMAGE_ID
+          echo VERSION=$VERSION

-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.prepare_tag.outputs.image_id }}:${{ steps.prepare_tag.outputs.version }}
-          build-args: |
-            GITHUB_REPOSITORY=$GITHUB_REPOSITORY
-            GITHUB_REF=$GITHUB_REF
+          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION
@@ -1,15 +1,17 @@
 name: CI

-on: [push, pull_request]
+on:
+  push:
+  workflow_dispatch:

 jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
        with:
-          node-version: 18.x
+          node-version: 14.x
      - run: npm ci
      - run: npm run jslint
      - run: npm test
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 node:18.15-alpine3.16 as base
+FROM --platform=linux/amd64 node:18.8.0-alpine as base

 RUN apk --update --no-cache add --virtual .builds-deps build-base python3

@@ -1,41 +1,10 @@
 # sbc-inbound ![Build Status](https://github.com/jambonz/sbc-inbound/workflows/CI/badge.svg)

-This application provides a part of the SBC (Session Border Controller) functionality of jambonz platform. It handles incoming INVITE requests from carrier sip trunks or from sip devices and webrtc applications. SIP INVITEs from known carriers are allowed in, while INVITEs from sip devices are challenged to authenticate.  SIP traffic that is allowed in is sent on to a jambonz application server in a private subnet.
+This application provides a part of the SBC (Session Border Controller) functionality of jambonz.  It handles incoming INVITE requests from carrier sip trunks or from sip devices and webrtc applications. SIP INVITEs from known carriers are allowed in, while INVITEs from sip devices are challenged to authenticate.  SIP traffic that is allowed in is sent on to a jambonz application server in a private subnet.

 ## Configuration

-Configuration is provided via environment variables:
-
-| variable | meaning | required?|
-|----------|----------|---------|
-|DRACHTIO_HOST| ip address of drachtio server (typically '127.0.0.1')|yes|
-|DRACHTIO_PORT| listening port of drachtio server for control connections (typically 9022)|yes|
-|DRACHTIO_SECRET| shared secret|yes|
-|HTTP_PORT| http listen port |no|
-|JAMBONES_LOGLEVEL| log level for application, 'info' or 'debug'|no|
-|JAMBONES_MYSQL_HOST| mysql host|yes|
-|JAMBONES_MYSQL_PORT| mysql port |no|
-|JAMBONES_MYSQL_USER| mysql username|yes|
-|JAMBONES_MYSQL_PASSWORD| mysql password|yes|
-|JAMBONES_MYSQL_DATABASE| mysql data|yes|
-|JAMBONES_MYSQL_CONNECTION_LIMIT| mysql connection limit |no|
-|DTMF_LISTEN_PORT| DTMF listening port |no|
-|JAMBONES_NG_PROTOCOL| rtpengine NG protocol |no|
-|RTPENGINE_PORT| rtpengine port |no|
-|JAMBONES_CLUSTER_ID| cluster id |no|
-|JAMBONES_NETWORK_CIDR| CIDR of private network that feature server is running in (e.g. '172.31.0.0/16')|yes|
-|JAMBONES_REDIS_HOST| redis host|yes|
-|JAMBONES_REDIS_PORT|redis port|no|
-|JAMBONES_RTPENGINES| commas-separated list of ip:ng-port for rtpengines (e.g. '172.31.32.10:22222')|no|
-|JAMBONES_TIME_SERIES_HOST| influxdb host |yes|
-|JAMBONES_TIME_SERIES_PORT| influxdb port |no|
-|JAMBONES_RECORD_ALL_CALLS| enable auto record calls, 'yes' or 'no' |no|
-|K8S| service running as kubernetes service |no|
-|K8S_RTPENGINE_SERVICE_NAME| rtpengine service name(required for K8S) |no|
-|K8S_FEATURE_SERVER_SERVICE_NAME| feature server service name(required for K8S) |no|
-|JWT_SECRET| secret for signing JWT token |yes|
-|ENCRYPTION_SECRET| secret for credential encryption(JWT_SECRET is deprecated) |yes|
-
+Configuration is provided via the [npmjs config](https://www.npmjs.com/package/config) package.  The following elements make up the configuration for the application:
 ##### drachtio server location
 ```
 {
@@ -3,17 +3,10 @@ assert.ok(process.env.JAMBONES_MYSQL_HOST &&
  process.env.JAMBONES_MYSQL_USER &&
  process.env.JAMBONES_MYSQL_PASSWORD &&
  process.env.JAMBONES_MYSQL_DATABASE, 'missing JAMBONES_MYSQL_XXX env vars');
-if (process.env.JAMBONES_REDIS_SENTINELS) {
-  assert.ok(process.env.JAMBONES_REDIS_SENTINEL_MASTER_NAME,
-    'missing JAMBONES_REDIS_SENTINEL_MASTER_NAME env var, JAMBONES_REDIS_SENTINEL_PASSWORD env var is optional');
-} else {
-  assert.ok(process.env.JAMBONES_REDIS_HOST, 'missing JAMBONES_REDIS_HOST env var');
-}
-assert.ok(process.env.DRACHTIO_PORT || process.env.DRACHTIO_HOST, 'missing DRACHTIO_PORT env vars');
+assert.ok(process.env.DRACHTIO_PORT || process.env.DRACHTIO_HOST, 'missing DRACHTIO_PORT env var');
 assert.ok(process.env.DRACHTIO_SECRET, 'missing DRACHTIO_SECRET env var');
 assert.ok(process.env.JAMBONES_TIME_SERIES_HOST, 'missing JAMBONES_TIME_SERIES_HOST env var');
 assert.ok(process.env.JAMBONES_NETWORK_CIDR || process.env.K8S, 'missing JAMBONES_NETWORK_CIDR env var');
-
 const Srf = require('drachtio-srf');
 const srf = new Srf('sbc-inbound');
 const opts = Object.assign({
@@ -35,7 +28,6 @@ const {
  commitInterval: 'test' === process.env.NODE_ENV ? 7 : 20
 });
 const StatsCollector = require('@jambonz/stats-collector');
-const CIDRMatcher = require('cidr-matcher');
 const stats = new StatsCollector(logger);
 const {equalsIgnoreOrder, createHealthCheckApp, systemHealth} = require('./lib/utils');
 const {LifeCycleEvents} = require('./lib/constants');
@@ -54,11 +46,9 @@ const {
  lookupAccountBySipRealm,
  lookupAccountBySid,
  lookupAccountCapacitiesBySid,
-  queryCallLimits,
-  lookupClientByAccountAndUsername
+  queryCallLimits
 } = require('@jambonz/db-helpers')({
  host: process.env.JAMBONES_MYSQL_HOST,
-  port: process.env.JAMBONES_MYSQL_PORT || 3306,
  user: process.env.JAMBONES_MYSQL_USER,
  password: process.env.JAMBONES_MYSQL_PASSWORD,
  database: process.env.JAMBONES_MYSQL_DATABASE,
@@ -71,12 +61,15 @@ const {
  addToSet,
  removeFromSet,
  incrKey,
-  decrKey} = require('@jambonz/realtimedb-helpers')({}, logger);
+  decrKey} = require('@jambonz/realtimedb-helpers')({
+  host: process.env.JAMBONES_REDIS_HOST || 'localhost',
+  port: process.env.JAMBONES_REDIS_PORT || 6379
+}, logger);

 const ngProtocol = process.env.JAMBONES_NG_PROTOCOL || 'udp';
 const ngPort = process.env.RTPENGINE_PORT || ('udp' === ngProtocol ? 22222 : 8080);
 const {getRtpEngine, setRtpEngines} = require('@jambonz/rtpengine-utils')([], logger, {
-  //emitter: stats,
+  emitter: stats,
  dtmfListenPort: process.env.DTMF_LISTEN_PORT || 22224,
  protocol: ngProtocol
 });
@@ -101,8 +94,7 @@ srf.locals = {...srf.locals,
    lookupAccountBySid,
    lookupAccountBySipRealm,
    lookupAccountCapacitiesBySid,
-    queryCallLimits,
-    lookupClientByAccountAndUsername
+    queryCallLimits
  },
  realtimeDbHelpers: {
    createSet,
@@ -115,8 +107,7 @@ const {
  getSPForAccount,
  wasOriginatedFromCarrier,
  getApplicationForDidAndCarrier,
-  getOutboundGatewayForRefer,
-  getApplicationBySid
+  getOutboundGatewayForRefer
 } = require('./lib/db-utils')(srf, logger);
 srf.locals = {
  ...srf.locals,
@@ -124,8 +115,7 @@ srf.locals = {
  wasOriginatedFromCarrier,
  getApplicationForDidAndCarrier,
  getOutboundGatewayForRefer,
-  getFeatureServer: require('./lib/fs-tracking')(srf, logger),
-  getApplicationBySid
+  getFeatureServer: require('./lib/fs-tracking')(srf, logger)
 };
 const activeCallIds = srf.locals.activeCallIds;

@@ -139,6 +129,7 @@ const {
 const CallSession = require('./lib/call-session');

 if (process.env.DRACHTIO_HOST && !process.env.K8S) {
+  const CIDRMatcher = require('cidr-matcher');
  const cidrs = process.env.JAMBONES_NETWORK_CIDR
    .split(',')
    .map((s) => s.trim());
@@ -173,23 +164,6 @@ else {
    logger.info(`listening in outbound mode on port ${process.env.DRACHTIO_PORT}`);
  });
  srf.listen({port: process.env.DRACHTIO_PORT, secret: process.env.DRACHTIO_SECRET});
-  srf.on('connect', (err, hp) => {
-    if (err) return this.logger.error({err}, 'Error connecting to drachtio server');
-    logger.info(`connected to drachtio listening on ${hp}`);
-
-    if (process.env.K8S_FEATURE_SERVER_TRANSPORT === 'tcp') {
-      const matcher = new CIDRMatcher(['192.168.0.0/24', '172.16.0.0/16', '10.0.0.0/8']);
-      const hostports = hp.split(',');
-      for (const hp of hostports) {
-        const arr = /^(.*)\/(.*):(\d+)$/.exec(hp);
-        if (arr && matcher.contains(arr[2])) {
-          const hostport = `${arr[2]}:${arr[3]}`;
-          logger.info(`using sbc private address when sending to feature-server: ${hostport}`);
-          srf.locals.privateSipAddress = hostport;
-        }
-      }
-    }
-  });
 }
 if (process.env.NODE_ENV === 'test') {
  srf.on('error', (err) => {
@@ -256,12 +230,12 @@ if (process.env.K8S || process.env.HTTP_PORT) {
 if ('test' !== process.env.NODE_ENV) {
  /* update call stats periodically */
  setInterval(() => {
-    stats.gauge('sbc.sip.calls.count', activeCallIds.size,
-      ['direction:inbound', `instance_id:${process.env.INSTANCE_ID || 0}`]);
+    stats.gauge('sbc.sip.calls.count', activeCallIds.size, ['direction:inbound']);
  }, 20000);
 }

 const lookupRtpServiceEndpoints = (lookup, serviceName) => {
+  logger.debug(`dns lookup for ${serviceName}..`);
  lookup(serviceName, {family: 4, all: true}, (err, addresses) => {
    if (err) {
      logger.error({err}, `Error looking up ${serviceName}`);
@@ -331,18 +305,8 @@ process.on('SIGUSR2', handle.bind(null, removeFromSet, setName));
 process.on('SIGTERM', handle.bind(null, removeFromSet, setName));

 function handle(removeFromSet, setName, signal) {
-  logger.info(`got signal ${signal}`);
-  if (srf.locals.privateSipAddress && setName) {
-    logger.info(`removing ${srf.locals.privateSipAddress} from set ${setName}`);
-    removeFromSet(setName, srf.locals.privateSipAddress);
-  }
-  if (process.env.K8S) {
-    lifecycleEmitter.operationalState = LifeCycleEvents.ScaleIn;
-    if (0 === activeCallIds.size) {
-      logger.info('exiting immediately since we have no calls in progress');
-      process.exit(0);
-    }
-  }
+  logger.info(`got signal ${signal}, removing ${srf.locals.privateSipAddress} from set ${setName}`);
+  removeFromSet(setName, srf.locals.privateSipAddress);
 }

 module.exports = {srf, logger};
@@ -1,14 +1,14 @@
 {
  "default": {
    "transport-protocol": "UDP/TLS/RTP/SAVPF",
-    "ICE": "default",
+    "ICE": "force",
    "SDES": "off",
    "flags": ["generate mid", "SDES-no", "media handover", "port latching"],
    "rtcp-mux": ["require"]  
  },
  "teams": {
    "transport-protocol": "RTP/SAVP",
-    "ICE": "default",
+    "ICE": "force",
    "SDES": "off",
    "flags": ["generate mid", "SDES-no", "media handover", "port latching"],
    "rtcp-mux": ["accept"]
@@ -57,9 +57,6 @@ module.exports = (logger) => {
      }
    })();
  }
-  else if (process.env.K8S) {
-    lifecycleEmitter.scaleIn = () => process.exit(0);
-  }

  return {lifecycleEmitter};
 };
@@ -1,51 +1,26 @@
 const Emitter = require('events');
 const bent = require('bent');
 const assert = require('assert');
-const PORT = process.env.AWS_SNS_PORT || 3010;
+const PORT = process.env.AWS_SNS_PORT || 3001;
 const {LifeCycleEvents} = require('./constants');
 const express = require('express');
 const app = express();
 const getString = bent('string');
-const {
-  SNSClient,
-  SubscribeCommand,
-  UnsubscribeCommand } = require('@aws-sdk/client-sns');
-const snsClient = new SNSClient({ region: process.env.AWS_REGION, apiVersion: '2010-03-31' });
-const {
-  AutoScalingClient,
-  DescribeAutoScalingGroupsCommand,
-  CompleteLifecycleActionCommand } = require('@aws-sdk/client-auto-scaling');
-const autoScalingClient = new AutoScalingClient({ region: process.env.AWS_REGION, apiVersion: '2011-01-01' });
+const AWS = require('aws-sdk');
+const sns = new AWS.SNS({apiVersion: '2010-03-31'});
+const autoscaling = new AWS.AutoScaling({apiVersion: '2011-01-01'});
 const {Parser} = require('xml2js');
 const parser = new Parser();
 const {validatePayload} = require('verify-aws-sns-signature');

+AWS.config.update({region: process.env.AWS_REGION});
+
 class SnsNotifier extends Emitter {
  constructor(logger) {
    super();

    this.logger = logger;
  }
-  _doListen(logger, app, port, resolve) {
-    return app.listen(port, () => {
-      this.snsEndpoint = `http://${this.publicIp}:${port}`;
-      logger.info(`SNS lifecycle server listening on http://localhost:${port}`);
-      resolve(app);
-    });
-  }
-
-  _handleErrors(logger, app, resolve, reject, e) {
-    if (e.code === 'EADDRINUSE' &&
-      process.env.AWS_SNS_PORT_MAX &&
-      e.port < process.env.AWS_SNS_PORT_MAX) {
-
-      logger.info(`SNS lifecycle server failed to bind port on ${e.port}, will try next port`);
-      const server = this._doListen(logger, app, ++e.port, resolve);
-      server.on('error', this._handleErrors.bind(this, logger, app, resolve, reject));
-      return;
-    }
-    reject(e);
-  }

  async _handlePost(req, res) {
    try {
@@ -69,8 +44,7 @@ class SnsNotifier extends Emitter {
            subscriptionRequestId: this.subscriptionRequestId
          }, 'response from SNS SubscribeURL');
          const data = await this.describeInstance();
-          this.lifecycleState = data.AutoScalingGroups[0].Instances[0].LifecycleState;
-          this.emit('SubscriptionConfirmation', {publicIp: this.publicIp});
+          this.lifecycleState = data.AutoScalingInstances[0].LifecycleState;
          break;

        case 'Notification':
@@ -106,12 +80,14 @@ class SnsNotifier extends Emitter {

  async init() {
    try {
-      this.logger.debug('SnsNotifier: retrieving instance data');
+      this.logger.info('SnsNotifier: retrieving instance data');
      this.instanceId = await getString('http://169.254.169.254/latest/meta-data/instance-id');
      this.publicIp = await getString('http://169.254.169.254/latest/meta-data/public-ipv4');
+      this.snsEndpoint = `http://${this.publicIp}:${PORT}`;
      this.logger.info({
        instanceId: this.instanceId,
-        publicIp: this.publicIp
+        publicIp: this.publicIp,
+        snsEndpoint: this.snsEndpoint
      }, 'retrieved AWS instance data');

      // start listening
@@ -123,10 +99,7 @@ class SnsNotifier extends Emitter {
        this.logger.error(err, 'burped error');
        res.status(err.status || 500).json({msg: err.message});
      });
-      return new Promise((resolve, reject) => {
-        const server = this._doListen(this.logger, app, PORT, resolve);
-        server.on('error', this._handleErrors.bind(this, this.logger, app, resolve, reject));
-      });
+      app.listen(PORT);

    } catch (err) {
      this.logger.error({err}, 'Error retrieving AWS instance metadata');
@@ -135,12 +108,11 @@ class SnsNotifier extends Emitter {

  async subscribe() {
    try {
-      const params = {
+      const response = await sns.subscribe({
        Protocol: 'http',
        TopicArn: process.env.AWS_SNS_TOPIC_ARM,
        Endpoint: this.snsEndpoint
-      };
-      const response = await snsClient.send(new SubscribeCommand(params));
+      }).promise();
      this.logger.info({response}, `response to SNS subscribe to ${process.env.AWS_SNS_TOPIC_ARM}`);
    } catch (err) {
      this.logger.error({err}, `Error subscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARM}`);
@@ -150,10 +122,9 @@ class SnsNotifier extends Emitter {
  async unsubscribe() {
    if (!this.subscriptionArn) throw new Error('SnsNotifier#unsubscribe called without an active subscription');
    try {
-      const params = {
+      const response = await sns.unsubscribe({
        SubscriptionArn: this.subscriptionArn
-      };
-      const response = await snsClient.send(new UnsubscribeCommand(params));
+      }).promise();
      this.logger.info({response}, `response to SNS unsubscribe to ${process.env.AWS_SNS_TOPIC_ARM}`);
    } catch (err) {
      this.logger.error({err}, `Error unsubscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARM}`);
@@ -162,29 +133,26 @@ class SnsNotifier extends Emitter {

  completeScaleIn() {
    assert(this.scaleInParams);
-    autoScalingClient.send(new CompleteLifecycleActionCommand(this.scaleInParams))
-      .then((data) => {
-        return this.logger.info({data}, 'Successfully completed scale-in action');
-      })
-      .catch((err) => {
-        this.logger.error({err}, 'Error completing scale-in');
-      });
+    autoscaling.completeLifecycleAction(this.scaleInParams, (err, response) => {
+      if (err) return this.logger.error({err}, 'Error completing scale-in');
+      this.logger.info({response}, 'Successfully completed scale-in action');
+    });
  }

  describeInstance() {
    return new Promise((resolve, reject) => {
      if (!this.instanceId) return reject('instance-id unknown');
-      autoScalingClient.send(new DescribeAutoScalingGroupsCommand({
+      autoscaling.describeAutoScalingInstances({
        InstanceIds: [this.instanceId]
-      }))
-        .then((data) => {
-          this.logger.info({data}, 'SnsNotifier: describeInstance');
-          return resolve(data);
-        })
-        .catch((err) => {
+      }, (err, data) => {
+        if (err) {
          this.logger.error({err}, 'Error describing instances');
          reject(err);
-        });
+        } else {
+          this.logger.info({data}, 'SnsNotifier: describeInstance');
+          resolve(data);
+        }
+      });
    });
  }

@@ -198,7 +166,7 @@ module.exports = async function(logger) {
  process.on('SIGHUP', async() => {
    try {
      const data = await notifier.describeInstance();
-      const state = data.AutoScalingGroups[0].Instances[0].LifecycleState;
+      const state = data.AutoScalingInstances[0].LifecycleState;
      if (state !== notifier.lifecycleState) {
        notifier.lifecycleState = state;
        switch (state) {
@@ -3,11 +3,9 @@ const SrsClient = require('@jambonz/siprec-client-utils');
 const {
  makeRtpEngineOpts,
  SdpWantsSrtp,
-  SdpWantsSDES,
  nudgeCallCounts,
  roundTripTime,
-  parseConnectionIp,
-  isPrivateVoipNetwork
+  parseConnectionIp
 } = require('./utils');

 const {forwardInDialogRequests} = require('drachtio-fn-b2b-sugar');
@@ -15,7 +13,6 @@ const {parseUri, stringifyUri, SipError} = require('drachtio-srf');
 const debug = require('debug')('jambonz:sbc-inbound');
 const MS_TEAMS_USER_AGENT = 'Microsoft.PSTNHub.SIPProxy';
 const MS_TEAMS_SIP_ENDPOINT = 'sip.pstnhub.microsoft.com';
-const IMMUTABLE_HEADERS = ['via', 'from', 'to', 'call-id', 'cseq', 'max-forwards', 'content-length'];

 /**
 * this is to make sure the outgoing From has the number in the incoming From
@@ -24,10 +21,8 @@ const IMMUTABLE_HEADERS = ['via', 'from', 'to', 'call-id', 'cseq', 'max-forwards
 const createBLegFromHeader = (req) => {
  const from = req.getParsedHeader('From');
  const uri = parseUri(from.uri);
-  const name = from.name;
-  const displayName = name ? `${name} ` : '';
-  if (uri && uri.user) return `${displayName}<sip:${uri.user}@localhost>`;
-  else return `${displayName}<sip:anonymous@localhost>`;
+  if (uri && uri.user) return `<sip:${uri.user}@localhost>`;
+  return '<sip:anonymous@localhost>';
 };

 const createSiprecBody = (headers, sdp, type, content) => {
@@ -66,7 +61,6 @@ class CallSession extends Emitter {
    this.application_sid = req.locals.application_sid;
    this.account_sid = req.locals.account_sid;
    this.service_provider_sid = req.locals.service_provider_sid;
-    this.srsClients = [];
  }

  get isFromMSTeams() {
@@ -86,24 +80,6 @@ class CallSession extends Emitter {
    return tp && -1 !== tp.indexOf('SAVP');
  }

-  get isFive9VoiceStream() {
-    return this.req.has('X-Five9-StreamingPairId');
-  }
-
-  subscribeForDTMF(dlg) {
-    if (!this._subscribedForDTMF) {
-      this._subscribedForDTMF = true;
-      this.subscribeDTMF(this.logger, this.req.get('Call-ID'), this.rtpEngineOpts.uas.tag,
-        this._onDTMF.bind(this, dlg));
-    }
-  }
-  unsubscribeForDTMF() {
-    if (this._subscribedForDTMF) {
-      this._subscribedForDTMF = false;
-      this.unsubscribeDTMF(this.logger, this.req.get('Call-ID'), this.rtpEngineOpts.uas.tag);
-    }
-  }
-
  async connect() {
    const {sdp} = this.req.locals;
    this.logger.info('inbound call accepted for routing');
@@ -119,7 +95,6 @@ class CallSession extends Emitter {
      offer,
      answer,
      del,
-      query,
      blockMedia,
      unblockMedia,
      blockDTMF,
@@ -134,7 +109,6 @@ class CallSession extends Emitter {
    this.offer = offer;
    this.answer = answer;
    this.del = del;
-    this.query = query;
    this.blockMedia = blockMedia;
    this.unblockMedia = unblockMedia;
    this.blockDTMF = blockDTMF;
@@ -155,13 +129,8 @@ class CallSession extends Emitter {
    }
    this.logger.debug(`using feature server ${featureServer}`);

-    const wantsSrtp = this.req.locals.possibleWebRtcClient = SdpWantsSrtp(sdp);
-    const wantsSDES = SdpWantsSDES(sdp);
-    this.rtpEngineOpts = makeRtpEngineOpts(this.req, wantsSrtp, false, this.isFromMSTeams || wantsSDES);
-    this.rtpEngineResource = {
-      destroy: this.del.bind(null, this.rtpEngineOpts.common),
-      query: this.query.bind(null, this.rtpEngineOpts.common),
-    };
+    this.rtpEngineOpts = makeRtpEngineOpts(this.req, SdpWantsSrtp(sdp), false, this.isFromMSTeams);
+    this.rtpEngineResource = {destroy: this.del.bind(null, this.rtpEngineOpts.common)};
    const obj = parseUri(this.req.uri);
    let proxy, host, uri;

@@ -179,146 +148,144 @@ class CallSession extends Emitter {
    else uri = `${obj.scheme}:${host}`;
    this.logger.info(`uri will be: ${uri}, proxy ${proxy}`);

-    try {
-      const opts = {
-        ...this.rtpEngineOpts.common,
-        ...this.rtpEngineOpts.uac.mediaOpts,
-        'from-tag': this.rtpEngineOpts.uas.tag,
-        direction:  [isPrivateVoipNetwork(this.req.source_address) ? 'private' : 'public', 'private'],
-        sdp
-      };
-      const startAt = process.hrtime();
-      const response = await this.offer(opts);
-      this.rtpengineIp = opts.sdp ? parseConnectionIp(opts.sdp) : 'undefined';
-      const rtt = roundTripTime(startAt);
-      this.stats.histogram('app.rtpengine.response_time', rtt, [
-        'direction:inbound', 'command:offer', `rtpengine:${this.rtpengineIp}`]);
-      this.logger.debug({opts, response, rtt, rtpengine: this.rtpengineIp}, 'response from rtpengine to offer');
-      if ('ok' !== response.result) {
-        this.logger.error({}, `rtpengine offer failed with ${JSON.stringify(response)}`);
-        throw new Error('rtpengine failed: answer');
-      }
-
-      let headers = {
-        'From': createBLegFromHeader(this.req),
-        'To': this.req.get('To'),
-        'X-Account-Sid': this.req.locals.account_sid,
-        'X-CID': this.req.get('Call-ID'),
-        'X-Forwarded-For': `${this.req.source_address}`
-      };
-      if (this.privateSipAddress) headers = {...headers, Contact: `<sip:${this.privateSipAddress}>`};
-
-      const spdOfferB = this.siprec && this.xml ?
-        createSiprecBody(headers, response.sdp, this.xml.type, this.xml.content) :
-        response.sdp;
-
-      const responseHeaders = {};
-      if (this.req.locals.carrier) {
-        Object.assign(headers, {
-          'X-Originating-Carrier': this.req.locals.carrier,
-          'X-Voip-Carrier-Sid': this.req.locals.voip_carrier_sid
-        });
-      }
-      if (this.req.locals.msTeamsTenantFqdn) {
-        Object.assign(headers, {'X-MS-Teams-Tenant-FQDN': this.req.locals.msTeamsTenantFqdn});
-
-        // for Microsoft Teams the Contact header must include the tenant FQDN
-        Object.assign(responseHeaders, {
-          Allow: 'INVITE, ACK, OPTIONS, CANCEL, BYE, NOTIFY, UPDATE, PRACK',
-          Contact: `sip:${this.req.locals.msTeamsTenantFqdn}`
-        });
-      }
-      if (this.req.locals.application_sid) {
-        Object.assign(headers, {'X-Application-Sid': this.req.locals.application_sid});
-      }
-      if (this.req.authorization) {
-        if (this.req.authorization.grant && this.req.authorization.grant.application_sid) {
-          Object.assign(headers, {'X-Application-Sid': this.req.authorization.grant.application_sid});
+    const opts = {
+      ...this.rtpEngineOpts.common,
+      ...this.rtpEngineOpts.uac.mediaOpts,
+      'from-tag': this.rtpEngineOpts.uas.tag,
+      direction:  ['public', 'private'],
+      sdp
+    };
+    const startAt = process.hrtime();
+    this.offer(opts, async(err, response) => {
+      try {
+        if (err || 'ok' !== response.result) {
+          this.logger.error({}, `rtpengine offer failed with ${JSON.stringify(response)}`);
+          return this.res.send(480, {
+            headers: {
+              'X-Reason': 'RTPENGINE_OFFER_FAILED'
+            }
+          });
        }
-        if (this.req.authorization.challengeResponse) {
-          const {username, realm} = this.req.authorization.challengeResponse;
-          Object.assign(headers, {'X-Authenticated-User': `${username}@${realm}`});
+        this.rtpengineIp = opts.sdp ? parseConnectionIp(opts.sdp) : 'undefined';
+        const rtt = roundTripTime(startAt);
+        this.stats.histogram('app.rtpengine.response_time', rtt, [
+          'direction:inbound', 'command:offer', `rtpengine:${this.rtpengineIp}`]);
+        this.logger.debug({opts, response, rtt, rtpengine: this.rtpengineIp}, 'response from rtpengine to offer');
+        if ('ok' !== response.result) {
        }
-      }
+        let headers = {
+          'From': createBLegFromHeader(this.req),
+          'To': this.req.get('To'),
+          'X-Account-Sid': this.req.locals.account_sid,
+          'X-CID': this.req.get('Call-ID'),
+          'X-Forwarded-For': `${this.req.source_address}`
+        };
+        if (this.privateSipAddress) headers = {...headers, Contact: `<sip:${this.privateSipAddress}>`};

-      if (this.req.canceled) throw new Error('call canceled');
+        const spdOfferB = this.siprec && this.xml ?
+          createSiprecBody(headers, response.sdp, this.xml.type, this.xml.content) :
+          response.sdp;

-      // now send the INVITE in towards the feature servers
-      debug(`sending INVITE to ${proxy} with ${uri}`);
-      const {uas, uac} = await this.srf.createB2BUA(this.req, this.res, uri, {
-        proxy,
-        headers,
-        responseHeaders,
-        proxyRequestHeaders: [
-          'all',
-          '-Authorization',
-          '-Max-Forwards',
-          '-Record-Route',
-          '-Session-Expires',
-          '-X-Application-Sid',
-          '-X-Authenticated-User'
-        ],
-        proxyResponseHeaders: ['all', '-X-Trace-ID'],
-        localSdpB: spdOfferB,
-        localSdpA: async(sdp, res) => {
-          this.rtpEngineOpts.uac.tag = res.getParsedHeader('To').params.tag;
-          const opts = {
-            ...this.rtpEngineOpts.common,
-            ...this.rtpEngineOpts.uas.mediaOpts,
-            'from-tag': this.rtpEngineOpts.uas.tag,
-            'to-tag': this.rtpEngineOpts.uac.tag,
-            sdp
-          };
-          const startAt = process.hrtime();
-          const response = await this.answer(opts);
-          this.logger.debug({response, opts}, 'response from rtpengine to answer');
-          const rtt = roundTripTime(startAt);
-          this.stats.histogram('app.rtpengine.response_time', rtt, [
-            'direction:inbound', 'command:answer', `rtpengine:${this.rtpengineIp}`]);
-          if ('ok' !== response.result) {
-            this.logger.error(`rtpengine answer failed with ${JSON.stringify(response)}`);
-            throw new Error('rtpengine failed: answer');
+        const responseHeaders = {};
+        if (this.req.locals.carrier) {
+          Object.assign(headers, {
+            'X-Originating-Carrier': this.req.locals.carrier,
+            'X-Voip-Carrier-Sid': this.req.locals.voip_carrier_sid
+          });
+        }
+        if (this.req.locals.msTeamsTenantFqdn) {
+          Object.assign(headers, {'X-MS-Teams-Tenant-FQDN': this.req.locals.msTeamsTenantFqdn});
+
+          // for Microsoft Teams the Contact header must include the tenant FQDN
+          Object.assign(responseHeaders, {
+            Allow: 'INVITE, ACK, OPTIONS, CANCEL, BYE, NOTIFY, UPDATE, PRACK',
+            Contact: `sip:${this.req.locals.msTeamsTenantFqdn}`
+          });
+        }
+        if (this.req.locals.application_sid) {
+          Object.assign(headers, {'X-Application-Sid': this.req.locals.application_sid});
+        }
+        else if (this.req.authorization) {
+          if (this.req.authorization.grant && this.req.authorization.grant.application_sid) {
+            Object.assign(headers, {'X-Application-Sid': this.req.authorization.grant.application_sid});
          }
-          /* special case: Five9 Voicestream calls do not advertise a:sendonly, though they should */
-          if (this.isFive9VoiceStream) {
+          if (this.req.authorization.challengeResponse) {
+            const {username, realm} = this.req.authorization.challengeResponse;
+            Object.assign(headers, {'X-Authenticated-User': `${username}@${realm}`});
+          }
+        }
+
+        if (this.req.canceled) throw new Error('call canceled');
+
+        // now send the INVITE in towards the feature servers
+        debug(`sending INVITE to ${proxy} with ${uri}`);
+        const {uas, uac} = await this.srf.createB2BUA(this.req, this.res, uri, {
+          proxy,
+          headers,
+          responseHeaders,
+          proxyRequestHeaders: [
+            'all',
+            '-Authorization',
+            '-Max-Forwards',
+            '-Record-Route',
+            '-Session-Expires',
+            '-X-Subspace-Forwarded-For'
+          ],
+          proxyResponseHeaders: ['all', '-X-Trace-ID'],
+          localSdpB: spdOfferB,
+          localSdpA: async(sdp, res) => {
+            this.rtpEngineOpts.uac.tag = res.getParsedHeader('To').params.tag;
            const opts = {
              ...this.rtpEngineOpts.common,
-              'from-tag':this.rtpEngineOpts.uac.tag
+              ...this.rtpEngineOpts.uas.mediaOpts,
+              'from-tag': this.rtpEngineOpts.uas.tag,
+              'to-tag': this.rtpEngineOpts.uac.tag,
+              sdp
            };
-            this.logger.info('Voicestream call from Five9, blocking audio in the reverse direction');
-            const response = await Promise.all([this.blockMedia(opts), this.blockDTMF(opts)]);
-            this.logger.debug({response}, 'response to blockMedia/blockDTMF');
+            const startAt = process.hrtime();
+            const response = await this.answer(opts);
+            const rtt = roundTripTime(startAt);
+            this.stats.histogram('app.rtpengine.response_time', rtt, [
+              'direction:inbound', 'command:answer', `rtpengine:${this.rtpengineIp}`]);
+            if ('ok' !== response.result) {
+              this.logger.error(`rtpengine answer failed with ${JSON.stringify(response)}`);
+              throw new Error('rtpengine failed: answer');
+            }
+            return response.sdp;
          }
+        });

-          return response.sdp;
+        // successfully connected
+        this.logger.info('call connected successfully to feature server');
+        debug('call connected successfully to feature server');
+        this._setHandlers({uas, uac});
+
+
+      } catch (err) {
+        // eslint-disable-next-line promise/no-promise-in-callback
+        this.rtpEngineResource.destroy()
+          .catch((err) => this.logger.info({err}, 'Error destroying rtpe after failure'));
+        this.activeCallIds.delete(this.req.get('Call-ID'));
+        this.stats.gauge('sbc.sip.calls.count', this.activeCallIds.size);
+        if (err instanceof SipError) {
+          const tags = ['accepted:no', `sipStatus:${err.status}`, `originator:${this.req.locals.originator}`];
+          this.stats.increment('sbc.terminations', tags);
+          this.logger.info(`call failed to connect to feature server with ${err.status}`);
+          this.emit('failed');
        }
-      });
-
-      // successfully connected
-      this.logger.info('call connected successfully to feature server');
-      debug('call connected successfully to feature server');
-      this._setHandlers({uas, uac});
-      return;
-    } catch (err) {
-      this.rtpEngineResource.destroy().catch((err) => this.logger.info({err}, 'Error destroying rtpe after failure'));
-      this.activeCallIds.delete(this.req.get('Call-ID'));
-      if (err instanceof SipError) {
-        const tags = ['accepted:no', `sipStatus:${err.status}`, `originator:${this.req.locals.originator}`];
-        this.stats.increment('sbc.terminations', tags);
-        this.logger.info(`call failed to connect to feature server with ${err.status}`);
-        this.emit('failed');
+        else if (err.message !== 'call canceled') {
+          this.logger.error(err, 'unexpected error routing inbound call');
+        }
+        this.srf.endSession(this.req);
      }
-      else if (err.message !== 'call canceled') {
-        this.logger.error(err, 'unexpected error routing inbound call');
-      }
-      this.srf.endSession(this.req);
-    }
+    });
  }

  _setDlgHandlers(dlg) {
    const {callId} = dlg.sip;
    this.activeCallIds.set(callId, this);
-    this.subscribeForDTMF(this.uac);
+    this.subscribeDTMF(this.logger, callId, this.rtpEngineOpts.uas.tag,
+      this._onDTMF.bind(this));
    dlg.on('destroy', () => {
      debug('call ended with normal termination');
      this.logger.info('call ended with normal termination');
@@ -326,7 +293,10 @@ class CallSession extends Emitter {
      this.activeCallIds.delete(callId);
      if (dlg.other && dlg.other.connected) dlg.other.destroy().catch((e) => {});

-      this._stopRecording();
+      if (this.srsClient) {
+        this.srsClient.stop();
+        this.srsClient = null;
+      }

      this.srf.endSession(this.req);
    });
@@ -335,21 +305,14 @@ class CallSession extends Emitter {
    dlg.on('modify', this._onReinvite.bind(this, dlg));
  }

-  _stopRecording() {
-    if (this.srsClients.length) {
-      this.srsClients.forEach((c) => c.stop());
-      this.srsClients = [];
-    }
-  }
-
  _setHandlers({uas, uac}) {
    this.emit('connected');
    const callStart = Date.now();
-    const call_sid = uac.res?.get('X-Call-Sid');
-    const application_sid = this.application_sid || uac.res?.get('X-Application-Sid');
    const tags = ['accepted:yes', 'sipStatus:200', `originator:${this.req.locals.originator}`];
    this.stats.increment('sbc.terminations', tags);
    this.activeCallIds.set(this.req.get('Call-ID'), this);
+    const call_sid = uac.res?.get('X-Call-Sid');
+    const application_sid = this.application_sid || uac.res?.get('X-Application-Sid');
    if (this.req.locals.cdr) {
      this.req.locals.cdr = {
        ...this.req.locals.cdr,
@@ -363,27 +326,14 @@ class CallSession extends Emitter {
    this.uas = uas;
    this.uac = uac;
    [uas, uac].forEach((dlg) => {
-      dlg.on('destroy', async(bye) => {
+      dlg.on('destroy', async() => {
        const other = dlg.other;
        this.rtpEngineResource.destroy().catch((err) => {});
-        /* DH: need a better understanding of why query before delete is a good idea
-        this.rtpEngineResource.query()
-          .then((results) => {
-            this.logger.info({results}, 'rtpengine query results');
-            return this.rtpEngineResource.destroy();
-          })
-          .catch((err) => {});
-        */
        this.activeCallIds.delete(this.req.get('Call-ID'));
        try {
-          const headers = {};
-          Object.keys(bye.headers).forEach((h) => {
-            if (!IMMUTABLE_HEADERS.includes(h)) headers[h] = bye.headers[h];
-          });
-          await other.destroy({headers});
+          await other.destroy();
        } catch (err) {}
-        this.unsubscribeForDTMF();
-
+        this.unsubscribeDTMF(this.logger, this.req.get('Call-ID'), this.rtpEngineOpts.uas.tag);

        const trackingOn = process.env.JAMBONES_TRACK_ACCOUNT_CALLS ||
          process.env.JAMBONES_TRACK_SP_CALLS ||
@@ -405,19 +355,12 @@ class CallSession extends Emitter {
          const trunk = ['trunk', 'teams'].includes(this.req.locals.originator) ?
            this.req.locals.carrier :
            this.req.locals.originator;
-          const application = await this.srf.locals.getApplicationBySid(application_sid);
-          const isRecording = this.req.locals.account.record_all_calls || (application && application.record_all_calls);
-          const day = new Date();
-          let recording_url = `/Accounts/${this.account_sid}/RecentCalls/${call_sid}/record`;
-          recording_url += `/${day.getFullYear()}/${(day.getMonth() + 1).toString().padStart(2, '0')}`;
-          recording_url += `/${day.getDate().toString().padStart(2, '0')}/${this.req.locals.account.record_format}`;
          const cdr = {...this.req.locals.cdr,
            terminated_at: now,
            termination_reason: dlg.type === 'uas' ? 'caller hungup' : 'called party hungup',
            sip_status: 200,
            duration: Math.floor((now - callStart) / 1000),
-            trunk,
-            ...(isRecording && {recording_url})
+            trunk
          };
          this.logger.info({cdr}, 'going to write a cdr now..');
          this.writeCdrs({...this.req.locals.cdr,
@@ -425,8 +368,7 @@ class CallSession extends Emitter {
            termination_reason: dlg.type === 'uas' ? 'caller hungup' : 'called party hungup',
            sip_status: 200,
            duration: Math.floor((now - callStart) / 1000),
-            trunk,
-            ...(isRecording && {recording_url})
+            trunk
          })
            .then(() => this.logger.debug('successfully wrote cdr'))
            .catch((err) => this.logger.error({err}, 'Error writing cdr for completed call'));
@@ -437,14 +379,18 @@ class CallSession extends Emitter {
        dlg.other = null;
        other.other = null;

-        this._stopRecording();
+        if (this.srsClient) {
+          this.srsClient.stop();
+          this.srsClient = null;
+        }

        this.logger.info(`call ended with normal termination, there are ${this.activeCallIds.size} active`);
        this.srf.endSession(this.req);
      });
    });

-    this.subscribeForDTMF(uac);
+    this.subscribeDTMF(this.logger, this.req.get('Call-ID'), this.rtpEngineOpts.uas.tag,
+      this._onDTMF.bind(this, uac));

    uas.on('modify', this._onReinvite.bind(this, uas));
    uac.on('modify', this._onReinvite.bind(this, uac));
@@ -457,12 +403,6 @@ class CallSession extends Emitter {

    // default forwarding of other request types
    forwardInDialogRequests(uas, ['notify', 'options', 'message']);
-
-    // we need special handling for invite with null sdp followed by 3pcc re-invite
-    if (uas.local.sdp.includes('a=recvonly') || uas.local.sdp.includes('a=inactive')) {
-      this.logger.info('incoming call is recvonly or inactive, waiting for re-invite');
-      this._recvonly = true;
-    }
  }

  async _onDTMF(dlg, payload) {
@@ -544,7 +484,7 @@ Duration=${payload.duration} `
        });
      }

-      this.unsubscribeForDTMF();
+      this.unsubscribeDTMF(this.logger, this.req.get('Call-ID'), this.rtpEngineOpts.uas.tag);

      const uas = await this.srf.createUAS(req, res, {
        localSdp: response.sdp,
@@ -565,74 +505,23 @@ Duration=${payload.duration} `
  }

  async _onReinvite(dlg, req, res) {
-    const fromTag = dlg.type === 'uas' ? this.rtpEngineOpts.uas.tag : this.rtpEngineOpts.uac.tag;
-    const toTag = dlg.type === 'uas' ? this.rtpEngineOpts.uac.tag : this.rtpEngineOpts.uas.tag;
-    const reason = req.get('X-Reason');
-    const isReleasingMedia = reason && dlg.type === 'uac' && ['release-media', 'anchor-media'].includes(reason);
-    const offerMedia = dlg.type === 'uas' ? this.rtpEngineOpts.uac.mediaOpts : this.rtpEngineOpts.uas.mediaOpts;
-    const answerMedia = dlg.type === 'uas' ? this.rtpEngineOpts.uas.mediaOpts : this.rtpEngineOpts.uac.mediaOpts;
-    const direction =  dlg.type === 'uas' ? ['public', 'private'] : ['private', 'public'];
-
    try {
      /* check for re-invite with no SDP -- seen that from BT when they provide UUI info */
      if (!req.body) {
-        if (dlg.type === 'uas' && this._recvonly) {
-          /* seen this from Broadworks - initial INVITE has no SDP, then reINVITE with SDP */
-          this._recvonly = false;  //one-time only
-          const myMungedSdp = dlg.local.sdp.replace('a=recvonly', 'a=sendrecv').replace('a=inactive', 'a=sendrecv');
-          this.logger.info({myMungedSdp}, '_onReinvite (3gpp): got a reINVITE with no SDP while in recvonly mode');
-          res.send(200,
-            {
-              body: myMungedSdp
-            },
-            (err, req) => {},
-            async(ack) => {
-              const remoteOffer = ack.body;
-              this.logger.info({remoteOffer}, '_onReinvite (3gpp): got ACK for reINVITE with SDP');
-              let opts = {
-                ...this.rtpEngineOpts.common,
-                ...offerMedia,
-                'from-tag': fromTag,
-                'to-tag': toTag,
-                direction,
-                sdp: remoteOffer,
-              };
-              let response = await this.offer(opts);
-              if ('ok' !== response.result) {
-                res.send(488);
-                throw new Error(`_onReinvite (3gpp): rtpengine failed: offer: ${JSON.stringify(response)}`);
-              }
-              this.logger.info({response}, '_onReinvite (3gpp): response from rtpengine for offer');
-              const fsSdp = await dlg.other.modify(response.sdp);
-              opts = {
-                ...this.rtpEngineOpts.common,
-                ...answerMedia,
-                'from-tag': fromTag,
-                'to-tag': toTag,
-                sdp: fsSdp
-              };
-              response = await this.answer(opts);
-              if ('ok' !== response.result) {
-                res.send(488);
-                throw new Error(`_onReinvite(3gpp): rtpengine failed answer: ${JSON.stringify(response)}`);
-              }
-            }
-          );
-        }
-        else {
-          this.logger.info('got a reINVITE with no SDP; just respond with our current offer');
-          res.send(200, {body: dlg.local.sdp});
-        }
+        this.logger.info('got a reINVITE with no SDP; just respond with our current offer');
+        res.send(200, {body: dlg.local.sdp});
        return;
      }
      const offeredSdp = Array.isArray(req.payload) && req.payload.length > 1 ?
        req.payload.find((p) => p.type === 'application/sdp').content :
        req.body;

-      if (isReleasingMedia) {
-        if (!offerMedia.flags.includes('asymmetric')) offerMedia.flags.push('asymmetric');
-        offerMedia.flags = offerMedia.flags.filter((f) => f !== 'media handover');
-      }
+      const reason = req.get('X-Reason');
+      const fromTag = dlg.type === 'uas' ? this.rtpEngineOpts.uas.tag : this.rtpEngineOpts.uac.tag;
+      const toTag = dlg.type === 'uas' ? this.rtpEngineOpts.uac.tag : this.rtpEngineOpts.uas.tag;
+      const offerMedia = dlg.type === 'uas' ? this.rtpEngineOpts.uac.mediaOpts : this.rtpEngineOpts.uas.mediaOpts;
+      const answerMedia = dlg.type === 'uas' ? this.rtpEngineOpts.uas.mediaOpts : this.rtpEngineOpts.uac.mediaOpts;
+      const direction =  dlg.type === 'uas' ? ['public', 'private'] : ['private', 'public'];
      let opts = {
        ...this.rtpEngineOpts.common,
        ...offerMedia,
@@ -641,8 +530,7 @@ Duration=${payload.duration} `
        direction,
        sdp: offeredSdp,
      };
-      // Dont reset ICE - causes audiocodes webrtrc to fail with "missing ice-ufrag and ice-pwd in re-invite"
-      // if (reason && opts.flags && !opts.flags.includes('reset')) opts.flags.push('reset');
+      if (reason && opts.flags && !opts.flags.includes('reset')) opts.flags.push('reset');

      let response = await this.offer(opts);
      if ('ok' !== response.result) {
@@ -652,11 +540,11 @@ Duration=${payload.duration} `

      /* if this is a re-invite from the FS to change media anchoring, avoid sending the reinvite out */
      let sdp;
-      if (isReleasingMedia && !this.callerIsUsingSrtp) {
+      if (reason && dlg.type === 'uac' && ['release-media', 'anchor-media'].includes(reason) &&
+        !this.callerIsUsingSrtp) {
        this.logger.info({response}, `got a reinvite from FS to ${reason}`);
        sdp = dlg.other.remote.sdp;
-        if (!answerMedia.flags.includes('asymmetric')) answerMedia.flags.push('asymmetric');
-        answerMedia.flags = answerMedia.flags.filter((f) => f !== 'media handover');
+        answerMedia.flags = ['asymmetric', 'port latching'];
        this._mediaReleased = 'release-media' === reason;
      }
      else {
@@ -711,7 +599,6 @@ Duration=${payload.duration} `
            const to = this.req.getParsedHeader('To');
            const aorFrom = from.uri;
            const aorTo = to.uri;
-            const headers = contentType === 'application/json' && req.body ? JSON.parse(req.body) : {};
            this.logger.info({to, from}, 'startCallRecording request for a call');

            const srsUrl = req.get('X-Srs-Url');
@@ -719,7 +606,7 @@ Duration=${payload.duration} `
            const callSid = req.get('X-Call-Sid');
            const accountSid = req.get('X-Account-Sid');
            const applicationSid = req.get('X-Application-Sid');
-            if (this.srsClients.length) {
+            if (this.srsClient) {
              res.send(400);
              this.logger.info('discarding duplicate startCallRecording request for a call');
              return;
@@ -729,14 +616,13 @@ Duration=${payload.duration} `
              res.send(400);
              return;
            }
-            const arr = srsUrl.split(',');
-            this.srsClients = arr.map((url) => new SrsClient(this.logger, {
+            this.srsClient = new SrsClient(this.logger, {
              srf: dlg.srf,
              direction: 'inbound',
              originalInvite: this.req,
              callingNumber: this.req.callingNumber,
              calledNumber: this.req.calledNumber,
-              srsUrl: url,
+              srsUrl,
              srsRecordingId,
              callSid,
              accountSid,
@@ -751,74 +637,44 @@ Duration=${payload.duration} `
              del: this.del,
              blockMedia: this.blockMedia,
              unblockMedia: this.unblockMedia,
-              unsubscribe: this.unsubscribe,
-              headers
-            }));
+              unsubscribe: this.unsubscribe
+            });
            try {
-              succeeded = (await Promise.all(
-                this.srsClients.map((c) => c.start())
-              )).every((r) => r);
+              succeeded = await this.srsClient.start();
            } catch (err) {
              this.logger.error({err}, 'Error starting SipRec call recording');
            }
          }
          else if (reason === 'stopCallRecording') {
-            if (!this.srsClients.length) {
+            if (!this.srsClient) {
              res.send(400);
              this.logger.info('discarding stopCallRecording request because we are not recording');
              return;
            }
            try {
-              succeeded = (await Promise.all(
-                this.srsClients.map((c) => c.stop())
-              )).every((r) => r);
+              succeeded = await this.srsClient.stop();
            } catch (err) {
              this.logger.error({err}, 'Error stopping SipRec call recording');
            }
-            this.srsClients = [];
+            this.srsClient = null;
          }
          else if (reason === 'pauseCallRecording') {
-            if (!this.srsClients.length || this.srsClients.every((c) => c.paused)) {
+            if (!this.srsClient || this.srsClient.paused) {
              this.logger.info('discarding invalid pauseCallRecording request');
              res.send(400);
              return;
            }
-            succeeded = (await Promise.all(
-              this.srsClients.map((c) => c.pause())
-            )).every((r) => r);
+            succeeded = await this.srsClient.pause();
          }
          else if (reason === 'resumeCallRecording') {
-            if (!this.srsClients.length || !this.srsClients.every((c) => c.paused)) {
+            if (!this.srsClient || !this.srsClient.paused) {
              res.send(400);
              this.logger.info('discarding invalid resumeCallRecording request');
              return;
            }
-            succeeded = (await Promise.all(
-              this.srsClients.map((c) => c.resume())
-            )).every((r) => r);
+            succeeded = await this.srsClient.resume();
          }
          res.send(succeeded ? 200 : 503);
-        } else if (reason.includes('Dtmf')) {
-          const arr = /Signal=\s*([0-9#*])/.exec(req.body);
-          if (!arr) {
-            this.logger.info({body: req.body}, '_onInfo: invalid INFO Dtmf');
-            throw new Error(`_onInfo: no dtmf in body for ${contentType}`);
-          }
-          const code = arr[1];
-          const arr2 = /Duration=\s*(\d+)/.exec(req.body);
-          const duration = arr2 ? arr2[1] : 250;
-          const dtmfOpts = {
-            ...this.rtpEngineOpts.common,
-            'from-tag': this.rtpEngineOpts.uac.tag,
-            code,
-            duration
-          };
-          const response = await this.playDTMF(dtmfOpts);
-          if ('ok' !== response.result) {
-            this.logger.info({response}, `rtpengine play Dtmf failed with ${JSON.stringify(response)}`);
-            throw new Error('rtpengine failed: answer');
-          }
-          res.send(200);
        }
      }
      else if (dlg.type === 'uas' && ['application/dtmf-relay', 'application/dtmf'].includes(contentType)) {
@@ -856,9 +712,10 @@ Duration=${payload.duration} `
        }
      }
      else {
+        const immutableHdrs = ['via', 'from', 'to', 'call-id', 'cseq', 'max-forwards', 'content-length'];
        const headers = {};
        Object.keys(req.headers).forEach((h) => {
-          if (!IMMUTABLE_HEADERS.includes(h)) headers[h] = req.headers[h];
+          if (!immutableHdrs.includes(h)) headers[h] = req.headers[h];
        });
        const response = await dlg.other.request({method: 'INFO', headers, body: req.body});
        const responseHeaders = {};
@@ -868,8 +725,8 @@ Duration=${payload.duration} `
        res.send(response.status, {headers: responseHeaders, body: response.body});
      }
    } catch (err) {
-      if (this.srsClients.length) {
-        this.srsClients = [];
+      if (this.srsClient) {
+        this.srsClient = null;
      }
      res.send(500);
      this.logger.info({err}, `Error handing INFO request on ${dlg.type} leg`);
@@ -888,38 +745,30 @@ Duration=${payload.duration} `
        const referredBy = req.getParsedHeader('Referred-By');
        if (!referredBy) return res.send(400);
        const u = parseUri(referredBy.uri);
-        const leaveReferToAlone = req.has('X-Refer-To-Leave-Untouched');
-        if (leaveReferToAlone) {
-          this.logger.debug({referTo}, 'passing Refer-To header through untouched');
+
+        let selectedGateway = false;
+        let e164 = false;
+        if (gateway) {
+          /* host of Refer-to to an outbound gateway */
+          const gw = await this.srf.locals.getOutboundGatewayForRefer(gateway.voip_carrier_sid);
+          if (gw) {
+            selectedGateway = true;
+            e164 = gw.e164_leading_plus;
+            uri.host = gw.ipv4;
+            uri.port = gw.port;
+          }
        }
-        else {
-          const isDotDecimal = /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/.test(uri.host);
-          let selectedGateway = false;
-          let e164 = false;
-          if (gateway && isDotDecimal) {
-            /* host of Refer-to to an outbound gateway */
-            const gw = await this.srf.locals.getOutboundGatewayForRefer(gateway.voip_carrier_sid);
-            if (gw) {
-              selectedGateway = true;
-              e164 = gw.e164_leading_plus;
-              uri.host = gw.ipv4;
-              uri.port = gw.port;
-            }
-          }
-          if (!selectedGateway && isDotDecimal) {
-            uri.host = this.req.source_address;
-            uri.port = this.req.source_port;
-          }
-          if (e164 && !uri.user.startsWith('+')) {
-            uri.user = `+${uri.user}`;
-          }
+        if (!selectedGateway) {
+          uri.host = this.req.source_address;
+          uri.port = this.req.source_port;
+        }
+        if (e164 && !uri.user.startsWith('+')) {
+          uri.user = `+${uri.user}`;
        }
        // eslint-disable-next-line no-unused-vars
        const {via, from, to, 'call-id':callid, cseq, 'max-forwards':maxforwards,
          // eslint-disable-next-line no-unused-vars
          'content-length':contentlength, 'refer-to':_referto, 'referred-by':_referredby,
-          // eslint-disable-next-line no-unused-vars
-          'X-Refer-To-Leave-Untouched': _leave,
          ...customHeaders
        } = req.headers;

@@ -936,16 +785,15 @@ Duration=${payload.duration} `
      res.send(202);

      // invite to new fs
-      const headers = {
-        ...(req.has('X-Retain-Call-Sid') && {'X-Retain-Call-Sid': req.get('X-Retain-Call-Sid')}),
-        ...(req.has('X-Account-Sid') && {'X-Account-Sid': req.get('X-Account-Sid')})
-      };
+      const headers = {};
+      if (req.has('X-Retain-Call-Sid')) {
+        Object.assign(headers, {'X-Retain-Call-Sid': req.get('X-Retain-Call-Sid')});
+      }
      const uac = await this.srf.createUAC(referTo.uri, {localSdp: dlg.local.sdp, headers});
      this.uac = uac;
      uac.other = this.uas;
      this.uas.other = uac;
-      uac.on('info', this._onInfo.bind(this, uac));
-      uac.on('modify', this._onReinvite.bind(this, uac));
+      uac.on('modify', this._onFeatureServerReinvite.bind(this, uac));
      uac.on('refer', this._onFeatureServerTransfer.bind(this, uac));
      uac.on('destroy', () => {
        this.logger.info('call ended with normal termination');
@@ -954,22 +802,19 @@ Duration=${payload.duration} `
        uac.other.destroy();
        this.srf.endSession(this.req);
      });
+      // now we can destroy the old dialog
+      dlg.destroy().catch(() => {});

-      const opts = {
-        ...this.rtpEngineOpts.common,
-        'from-tag': this.rtpEngineOpts.uas.tag,
-        'to-tag': this.rtpEngineOpts.uac.tag,
-        sdp: uac.remote.sdp,
-        flags: ['port latching']
-      };
+      // modify rtpengine to stream to new feature server
+      const opts = Object.assign({sdp: uac.remote.sdp, 'to-tag': res.getParsedHeader('To').params.tag},
+        this.rtpEngineOpts.answer);
      const response = await this.answer(opts);
      if ('ok' !== response.result) {
-        throw new Error(`_onFeatureServerTransfer: rtpengine answer failed: ${JSON.stringify(response)}`);
+        res.send(488);
+        throw new Error(`_onFeatureServerReinvite: rtpengine failed: ${JSON.stringify(response)}`);
      }
-      dlg.destroy().catch(() => {});
      this.logger.info('successfully moved call to new feature server');
    } catch (err) {
-      res.send(488);
      this.logger.error(err, 'Error handling refer from feature server');
    }
  }
@@ -1027,7 +872,7 @@ Duration=${payload.duration} `

        // successfully connected
        this.logger.info('successfully connected new call leg for REFER');
-        this.unsubscribeForDTMF();
+        this.unsubscribeDTMF(this.logger, this.req.get('Call-ID'), this.rtpEngineOpts.uas.tag);
        this.referInvite = null;
        sendNotify(this.uas, '200 OK');
        this.uas.destroy();
@@ -11,8 +11,6 @@ vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask
 FROM sip_gateways sg, voip_carriers vc, accounts acc 
 WHERE acc.sip_realm = ? 
 AND vc.account_sid = acc.account_sid 
-AND vc.is_active = 1 
-AND sg.inbound = 1 
 AND sg.voip_carrier_sid = vc.voip_carrier_sid`;

 const sqlSelectAllCarriersForSPByRealm =
@@ -22,18 +20,15 @@ FROM sip_gateways sg, voip_carriers vc, accounts acc
 WHERE acc.sip_realm = ? 
 AND vc.service_provider_sid = acc.service_provider_sid  
 AND vc.account_sid IS NULL 
-AND vc.is_active = 1 
-AND sg.inbound = 1 
 AND sg.voip_carrier_sid = vc.voip_carrier_sid`;

 const sqlSelectAllGatewaysForSP =
 `SELECT sg.sip_gateway_sid, sg.voip_carrier_sid, vc.name, vc.service_provider_sid,  
-vc.account_sid, vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask  
+vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask  
 FROM sip_gateways sg, voip_carriers vc
 WHERE sg.voip_carrier_sid = vc.voip_carrier_sid 
 AND vc.service_provider_sid IS NOT NULL 
-AND vc.is_active = 1 
-AND sg.inbound = 1`;
+AND vc.is_active = 1`;

 const sqlCarriersForAccountBySid =
 `SELECT sg.sip_gateway_sid, sg.voip_carrier_sid, vc.name, vc.account_sid,  
@@ -41,13 +36,10 @@ vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask
 FROM sip_gateways sg, voip_carriers vc, accounts acc 
 WHERE acc.account_sid = ? 
 AND vc.account_sid = acc.account_sid 
-AND vc.is_active = 1 
-AND sg.inbound = 1 
 AND sg.voip_carrier_sid = vc.voip_carrier_sid`;

-const sqlAccountByRealm = 'SELECT * from accounts WHERE sip_realm = ? AND is_active = 1';
+const sqlAccountByRealm = 'SELECT * from accounts WHERE sip_realm = ?';
 const sqlAccountBySid = 'SELECT * from accounts WHERE account_sid = ?';
-const sqlApplicationBySid = 'SELECT * from applications WHERE application_sid = ?';

 const sqlQueryApplicationByDid = `
 SELECT * FROM phone_numbers 
@@ -65,25 +57,11 @@ WHERE sg.voip_carrier_sid = ?
 AND sg.voip_carrier_sid = vc.voip_carrier_sid 
 AND outbound = 1`;

-const sqlSelectCarrierRequiringRegistration = `
-SELECT sg.sip_gateway_sid, sg.voip_carrier_sid, vc.name, vc.service_provider_sid, vc.account_sid, 
-vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask  
-FROM sip_gateways sg, voip_carriers vc 
-WHERE sg.voip_carrier_sid = vc.voip_carrier_sid 
-AND vc.requires_register = 1 
-AND vc.is_active = 1 
-AND vc.register_sip_realm = ? 
-AND vc.register_username = ?`;
-
-const gatewayMatchesSourceAddress = (logger, source_address, gw) => {
+const gatewayMatchesSourceAddress = (source_address, gw) => {
  if (32 === gw.netmask && gw.ipv4 === source_address) return true;
  if (gw.netmask < 32) {
-    try {
-      const matcher = new CIDRMatcher([`${gw.ipv4}/${gw.netmask}`]);
-      return matcher.contains(source_address);
-    } catch (err) {
-      logger.info({err, gw}, 'gatewayMatchesSourceAddress: Error parsing netmask');
-    }
+    const matcher = new CIDRMatcher([`${gw.ipv4}/${gw.netmask}`]);
+    return matcher.contains(source_address);
  }
  return false;
 };
@@ -92,12 +70,6 @@ module.exports = (srf, logger) => {
  const {pool}  = srf.locals.dbHelpers;
  const pp = pool.promise();

-  const getApplicationBySid = async(application_sid) => {
-    const [r] = await pp.query(sqlApplicationBySid, [application_sid]);
-    if (0 === r.length) return null;
-    return r[0];
-  };
-
  const getSPForAccount = async(account_sid) => {
    const [r] = await pp.query(sqlSelectSPForAccount, [account_sid]);
    if (0 === r.length) return null;
@@ -111,14 +83,14 @@ module.exports = (srf, logger) => {

      /* if multiple, prefer a DNS name */
      const hasDns = r.find((row) => row.ipv4.match(/^[A-Za-z]/));
-      return hasDns /* || r[0] */;
+      return hasDns || r[0];
    } catch (err) {
      logger.error({err}, 'getOutboundGatewayForRefer');
    }
  };

  const getApplicationForDidAndCarrier = async(req, voip_carrier_sid) => {
-    const did = normalizeDID(req.calledNumber) || 'anonymous';
+    const did = normalizeDID(req.calledNumber);

    try {
      /* straight DID match */
@@ -142,181 +114,46 @@ module.exports = (srf, logger) => {
    const failure = {fromCarrier: false};
    const uri = parseUri(req.uri);
    const isDotDecimal = /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/.test(uri.host);
-    const did = normalizeDID(req.calledNumber) || 'anonymous';
-    if (!isDotDecimal) {
-      /**
-       * The host part of the SIP URI is not a dot-decimal IP address,
-       * so this can be one of two things:
-       * (1) a sip realm value associate with an account, or
-       * (2) a carrier name for a carrier that we send outbound registrations to
-       *
-       * Let's look for case #1 first...
-       */

-      /* does anyone own this sip realm? */
-      const [a] = await pp.query(sqlAccountByRealm, [uri.host]);
-      if (a.length) {
-        assert(a.length === 1);
+    if (isDotDecimal) {
+      if (process.env.JAMBONES_HOSTING) {
+        if (!process.env.SBC_ACCOUNT_SID) return failure;

-        /* yes they do */
-        logger.debug(`sip realm is associated with account_sid: ${a[0].account_sid}`);
-
-        /**
-         * We have one of two cases:
-         * (1a). The user configured his or her carrier to send to their sip realm, or
-         * (1b). The user is making a call from a sip device.
-         */
-
-        /* get all the carriers and gateways for the account owning this sip realm */
-        const [gwAcc] = await pp.query(sqlSelectAllCarriersForAccountByRealm, [uri.host]);
-        const [gwSP] = gwAcc.length ? [[]] : await pp.query(sqlSelectAllCarriersForSPByRealm, uri.host);
-        const gw = gwAcc
-          .concat(gwSP)
-          .sort((a, b) => b.netmask - a.netmask);
-        const selected = gw.find(gatewayMatchesSourceAddress.bind(null, logger, req.source_address));
-        if (selected) {
-          const sql =
-            `SELECT application_sid FROM phone_numbers WHERE number = '${did}'
-            AND voip_carrier_sid = '${selected.voip_carrier_sid}'
-            AND account_sid = '${a[0].account_sid}'`;
-          logger.debug({selected, sql, did}, 'looking up DID');
-          const [r] = await pp.query(sql);
-
-          return {
-            fromCarrier: true,
-            gateway: selected,
-            service_provider_sid: a[0].service_provider_sid,
-            account_sid: a[0].account_sid,
-            application_sid: r[0]?.application_sid || selected.application_sid,
-            account: a[0]
-          };
-        }
-        return failure;
+        /* look for carrier only within that account */
+        const [r] = await pp.query(sqlCarriersForAccountBySid,
+          [process.env.SBC_ACCOUNT_SID, req.source_address, req.source_port]);
+        if (0 === r.length) return failure;
+        const service_provider_sid = await getSPForAccount(process.env.SBC_ACCOUNT_SID);
+        return {
+          fromCarrier: true,
+          gateway: r[0],
+          account_sid: process.env.SBC_ACCOUNT_SID,
+          service_provider_sid
+        };
      }
-
-
-      /* no match, so let's look for case #2 */
-      try {
-        logger.info({
-          host: uri.host,
-          user: uri.user
-        }, 'sip realm is not associated with an account, checking carriers');
-        const [gw] = await pp.query(sqlSelectCarrierRequiringRegistration, [uri.host, uri.user]);
-        const matches = gw
-          .sort((a, b) => b.netmask - a.netmask)
-          .filter(gatewayMatchesSourceAddress.bind(null, logger, req.source_address));
-        if (1 === matches.length) {
-          // bingo
-          //TODO: this assumes the carrier is associate to an account, not an SP
-          //if the carrier is associated with an SP (which would mean we
-          //must see a dialed number in the To header, not the register username),
-          //then we need to look up the account based on the dialed number in the To header
-          const [a] = await pp.query(sqlAccountBySid, [[matches[0].account_sid]]);
-          if (0 === a.length) return failure;
-          logger.debug({matches}, `found registration carrier using ${uri.host} and ${uri.user}`);
-          const sql =
-            `SELECT application_sid FROM phone_numbers WHERE number = '${did}'
-            AND voip_carrier_sid = '${matches[0].voip_carrier_sid}'
-            AND account_sid = '${matches[0].account_sid}'`;
-          logger.debug({matches: matches[0], sql, did}, 'looking up DID');
+      else {
+        /* we may have a carrier at the service provider level */
+        const [gw] = await pp.query(sqlSelectAllGatewaysForSP);
+        const matches = gw.filter(gatewayMatchesSourceAddress.bind(null, req.source_address));
+        if (matches.length) {
+          /* we have one or more carriers that match.  Now we need to find one with a provisioned phone number */
+          const vc_sids = matches.map((m) => `'${m.voip_carrier_sid}'`).join(',');
+          const did = normalizeDID(req.calledNumber);
+          const sql =  `SELECT * FROM phone_numbers WHERE number = ${did} AND voip_carrier_sid IN (${vc_sids})`;
+          logger.debug({matches, sql, did, vc_sids}, 'looking up DID');

          const [r] = await pp.query(sql);
-          return {
-            fromCarrier: true,
-            gateway: matches[0],
-            service_provider_sid: a[0].service_provider_sid,
-            account_sid: a[0].account_sid,
-            application_sid: r[0]?.application_sid || matches[0].application_sid,
-            account: a[0]
-          };
-        }
-        else if (matches.length > 1) {
-          logger.warn({matches, source_address: req.source_address}, 'multiple gateways match source address');
-          return {
-            fromCarrier: true,
-            error: 'Multiple gateways match registration carrier source address'
-          };
-        }
-      } catch (err) {
-        logger.info({err, host: uri.host, user: uri.user}, 'Error looking up carrier by host and user');
-      }
-      /* no match, so fall through  */
-    }
-
-    if (isDotDecimal && process.env.JAMBONES_HOSTING) {
-      if (!process.env.SBC_ACCOUNT_SID) return failure;
-
-      /* look for carrier only within that account */
-      const [r] = await pp.query(sqlCarriersForAccountBySid,
-        [process.env.SBC_ACCOUNT_SID, req.source_address, req.source_port]);
-      if (0 === r.length) return failure;
-      const service_provider_sid = await getSPForAccount(process.env.SBC_ACCOUNT_SID);
-      return {
-        fromCarrier: true,
-        gateway: r[0],
-        account_sid: process.env.SBC_ACCOUNT_SID,
-        service_provider_sid
-      };
-    }
-    else {
-      /* find all carrier entries that have an inbound gateway matching the source IP */
-      const [gw] = await pp.query(sqlSelectAllGatewaysForSP);
-      let matches = gw
-        .sort((a, b) => b.netmask - a.netmask)
-        .filter(gatewayMatchesSourceAddress.bind(null, logger, req.source_address))
-        .map((gw) => {
-          return {
-            voip_carrier_sid: gw.voip_carrier_sid,
-            name: gw.name,
-            service_provider_sid: gw.service_provider_sid,
-            account_sid: gw.account_sid,
-            application_sid: gw.application_sid
-          };
-        });
-      /* remove duplicates, winnow down to voip_carriers, not gateways */
-      matches = [...new Set(matches.map(JSON.stringify))].map(JSON.parse);
-      if (matches.length) {
-        /* we have one or more matches.  Now check for one with a provisioned phone number matching the DID */
-        const vc_sids = matches.map((m) => `'${m.voip_carrier_sid}'`).join(',');
-        const sql =  `SELECT * FROM phone_numbers WHERE number = '${did}' AND voip_carrier_sid IN (${vc_sids})`;
-        logger.debug({matches, sql, did, vc_sids}, 'looking up DID');
-
-        const [r] = await pp.query(sql);
-        if (0 === r.length) {
-          /* came from a provisioned carrier, but the dialed number is not provisioned.
-              check if we have an account with default routing of that carrier to an application
-          */
-          const accountLevelGateways = matches.filter((m) => m.account_sid && m.application_sid);
-          if (accountLevelGateways.length > 1) {
-            logger.info({accounts: accountLevelGateways.map((m) => m.account_sid)},
-              'multiple accounts have added this carrier with default routing -- cannot determine which to use');
-            return {
-              fromCarrier: true,
-              error: 'Multiple accounts are attempting to default route this carrier'
-            };
-          }
-          else if (accountLevelGateways.length === 1) {
-            const [accounts] = await pp.query('SELECT * from accounts where account_sid = ?',
-              [accountLevelGateways[0].account_sid]);
-            return {
-              fromCarrier: true,
-              gateway: accountLevelGateways[0],
-              service_provider_sid: accountLevelGateways[0].service_provider_sid,
-              account_sid: accountLevelGateways[0].account_sid,
-              application_sid: accountLevelGateways[0].application_sid,
-              account: accounts[0]
-            };
-          }
-          else {
-            /* check if we only have a single account, otherwise we have no
-               way of knowing which account this is for
+          if (0 === r.length) {
+            /* came from a carrier, but number is not provisioned..
+               check if we only have a single account, otherwise we have no
+               way of knowing which account this is for
            */
            const [r] = await pp.query('SELECT count(*) as count from accounts where service_provider_sid = ?',
-              [matches[0].service_provider_sid]);
-            if (r[0].count === 0 || r[0].count > 1) return {fromCarrier: true};
+              matches[0].service_provider_sid);
+            if (r[0].count === 0) return {fromCarrier: true};
            else {
              const [accounts] = await pp.query('SELECT * from accounts where service_provider_sid = ?',
-                [matches[0].service_provider_sid]);
+                matches[0].service_provider_sid);
              return {
                fromCarrier: true,
                gateway: matches[0],
@@ -326,30 +163,39 @@ module.exports = (srf, logger) => {
              };
            }
          }
-        }
-        else if (r.length > 1) {
-          logger.info({r},
-            'multiple accounts have added this carrier with default routing -- cannot determine which to use');
+          const gateway = matches.find((m) => m.voip_carrier_sid === r[0].voip_carrier_sid);
+          const [accounts] = await pp.query(sqlAccountBySid, r[0].account_sid);
+          assert(accounts.length);
          return {
            fromCarrier: true,
-            error: 'Multiple accounts are attempting to route the same phone number from the same carrier'
+            gateway,
+            service_provider_sid: accounts[0].service_provider_sid,
+            account_sid: r[0].account_sid,
+            application_sid: r[0].application_sid,
+            account: accounts[0]
          };
        }
-
-        /* we have a route for this phone number and carrier combination */
-        const gateway = matches.find((m) => m.voip_carrier_sid === r[0].voip_carrier_sid);
-        const [accounts] = await pp.query(sqlAccountBySid, [r[0].account_sid]);
-        assert(accounts.length);
-        return {
-          fromCarrier: true,
-          gateway,
-          service_provider_sid: accounts[0].service_provider_sid,
-          account_sid: r[0].account_sid,
-          application_sid: r[0].application_sid,
-          account: accounts[0]
-        };
+        return failure;
      }
    }
+
+    /* get all the carriers and gateways for the account owning this sip realm */
+    const [gwAcc] = await pp.query(sqlSelectAllCarriersForAccountByRealm, uri.host);
+    const [gwSP] = gwAcc.length ? [[]] : await pp.query(sqlSelectAllCarriersForSPByRealm, uri.host);
+    const gw = gwAcc.concat(gwSP);
+    const selected = gw.find(gatewayMatchesSourceAddress.bind(null, req.source_address));
+    if (selected) {
+      const [a] = await pp.query(sqlAccountByRealm, uri.host);
+      if (0 === a.length) return failure;
+      return {
+        fromCarrier: true,
+        gateway: selected,
+        service_provider_sid: a[0].service_provider_sid,
+        account_sid: a[0].account_sid,
+        application_sid: selected.application_sid,
+        account: a[0]
+      };
+    }
    return failure;
  };

@@ -357,7 +203,6 @@ module.exports = (srf, logger) => {
    wasOriginatedFromCarrier,
    getApplicationForDidAndCarrier,
    getOutboundGatewayForRefer,
-    getSPForAccount,
-    getApplicationBySid
+    getSPForAccount
  };
 };
@@ -15,9 +15,7 @@ module.exports = (srf, logger) => {
  return async() => {
    try {
      if (process.env.K8S) {
-        return process.env.K8S_FEATURE_SERVER_TRANSPORT ?
-          `${process.env.K8S_FEATURE_SERVER_SERVICE_NAME};transport=${process.env.K8S_FEATURE_SERVER_TRANSPORT}` :
-          process.env.K8S_FEATURE_SERVER_SERVICE_NAME;
+        return process.env.K8S_FEATURE_SERVER_SERVICE_NAME;
      }
      else {
        const fs = await retrieveSet(setName);
@@ -1,8 +1,8 @@
 const debug = require('debug')('jambonz:sbc-inbound');
 const assert = require('assert');
+const Emitter = require('events');
 const parseUri = require('drachtio-srf').parseUri;
-const {nudgeCallCounts, roundTripTime, isMSTeamsCIDR} = require('./utils');
-const digestChallenge = require('@jambonz/digest-utils');
+const {nudgeCallCounts} = require('./utils');
 const msProxyIps = process.env.MS_TEAMS_SIP_PROXY_IPS ?
  process.env.MS_TEAMS_SIP_PROXY_IPS.split(',').map((i) => i.trim()) :
  [];
@@ -22,8 +22,42 @@ const initCdr = (req) => {
 };

 module.exports = function(srf, logger) {
+  class AuthOutcomeReporter extends Emitter {
+    constructor(stats) {
+      super();
+      this
+        .on('regHookOutcome', ({rtt, status}) => {
+          stats.histogram('app.hook.response_time', rtt, ['hook_type:auth', `status:${status}`]);
+        })
+        .on('error', async(err, req) => {
+          const {account_sid, account} = req.locals;
+          const {writeAlerts, AlertType} = req.srf.locals;
+          if (account_sid) {
+            let opts = {account_sid, service_provider_sid: account.service_provider_sid};
+            if (err.code === 'ECONNREFUSED') {
+              opts = {...opts, alert_type: AlertType.WEBHOOK_CONNECTION_FAILURE, url: err.hook};
+            }
+            else if (err.code === 'ENOTFOUND') {
+              opts = {...opts, alert_type: AlertType.WEBHOOK_CONNECTION_FAILURE, url: err.hook};
+            }
+            else if (err.name === 'StatusError') {
+              opts = {...opts, alert_type: AlertType.WEBHOOK_STATUS_FAILURE, url: err.hook, status: err.statusCode};
+            }
+
+            if (opts.alert_type) {
+              try {
+                await writeAlerts(opts);
+              } catch (err) {
+                logger.error({err, opts}, 'Error writing alert');
+              }
+            }
+          }
+        });
+    }
+  }

  const {
+    lookupAuthHook,
    lookupAppByTeamsTenant,
    lookupAccountBySipRealm,
    lookupAccountBySid,
@@ -31,6 +65,10 @@ module.exports = function(srf, logger) {
    queryCallLimits
  }  = srf.locals.dbHelpers;
  const {stats, writeCdrs} = srf.locals;
+  const authenticator = require('@jambonz/http-authenticator')(lookupAuthHook, logger, {
+    blacklistUnknownRealms: true,
+    emitter: new AuthOutcomeReporter(stats)
+  });

  const initLocals = (req, res, next) => {
    const callId = req.get('Call-ID');
@@ -97,20 +135,15 @@ module.exports = function(srf, logger) {
  const identifyAccount = async(req, res, next) => {
    try {
      const {siprec, callId} = req.locals;
-      const {getSPForAccount, wasOriginatedFromCarrier, getApplicationForDidAndCarrier, stats} = req.srf.locals;
-      const startAt = process.hrtime();
+      const {getSPForAccount, wasOriginatedFromCarrier, getApplicationForDidAndCarrier} = req.srf.locals;
      const {
        fromCarrier,
        gateway,
        account_sid,
        application_sid,
        service_provider_sid,
-        account,
-        error
+        account
      } = await wasOriginatedFromCarrier(req);
-      const rtt = roundTripTime(startAt);
-      stats.histogram('app.mysql.response_time', rtt, [
-        'query:wasOriginatedFromCarrier', 'app:sbc-inbound']);
      /**
       * calls come from 3 sources:
       * (1) A carrier
@@ -118,18 +151,11 @@ module.exports = function(srf, logger) {
       * (3) A SIP user
       */
      if (fromCarrier) {
-        if (error) {
-          return res.send(503, {
-            headers: {
-              'X-Reason': error
-            }
-          });
-        }
        if (!gateway) {
          logger.info('identifyAccount: rejecting call from carrier because DID has not been provisioned');
          return res.send(404, 'Number Not Provisioned');
        }
-        logger.info({gateway}, 'identifyAccount: incoming call from gateway');
+        logger.debug({gateway}, 'identifyAccount: incoming call from gateway');

        let sid;
        if (siprec) {
@@ -155,8 +181,8 @@ module.exports = function(srf, logger) {
          ...req.locals
        };
      }
-      else if (msProxyIps.includes(req.source_address) || isMSTeamsCIDR(req.source_address)) {
-        logger.info({source_address: req.source_address}, 'identifyAccount: incoming call from Microsoft Teams');
+      else if (msProxyIps.includes(req.source_address)) {
+        logger.debug({source_address: req.source_address}, 'identifyAccount: incoming call from Microsoft Teams');
        const uri = parseUri(req.uri);

        const app = await lookupAppByTeamsTenant(uri.host);
@@ -178,7 +204,7 @@ module.exports = function(srf, logger) {
      else {
        req.locals.originator = 'user';
        const uri = parseUri(req.uri);
-        logger.info({source_address: req.source_address, realm: uri.host},
+        logger.debug({source_address: req.source_address, realm: uri.host},
          'identifyAccount: incoming user call');
        const account = await lookupAccountBySipRealm(uri.host);
        if (!account) {
@@ -202,13 +228,6 @@ module.exports = function(srf, logger) {
          account,
          application_sid: account.device_calling_application_sid,
          webhook_secret: account.webhook_secret,
-          realm: uri.host,
-          ...(account.registration_hook && {
-            registration_hook_url: account.registration_hook.url,
-            registration_hook_method: account.registration_hook.method,
-            registration_hook_username: account.registration_hook.username,
-            registration_hook_password: account.registration_hook.password
-          }),
          ...req.locals
        };
      }
@@ -351,7 +370,7 @@ module.exports = function(srf, logger) {
    try {
      /* TODO: check if this is a gateway that we have an ACL for */
      if (req.locals.originator !== 'user') return next();
-      return digestChallenge(req, res, next);
+      return authenticator(req, res, next);
    } catch (err) {
      stats.increment('sbc.terminations', ['sipStatus:500']);
      logger.error(err, `${req.get('Call-ID')} Error looking up related info for inbound call`);
@@ -1,8 +1,5 @@
-const CIDRMatcher = require('cidr-matcher');
-const express = require('express');
 const rtpCharacteristics = require('../data/rtp-transcoding');
 const srtpCharacteristics = require('../data/srtp-transcoding');
-
 let idx = 0;

 const isWSS = (req) => {
@@ -15,22 +12,19 @@ const getAppserver = (srf) => {
 };

 function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, teams = false) {
-  const rtpCopy = JSON.parse(JSON.stringify(rtpCharacteristics));
-  const srtpCopy = JSON.parse(JSON.stringify(srtpCharacteristics));
  const from = req.getParsedHeader('from');
-  const srtpOpts = teams ? srtpCopy['teams'] : srtpCopy['default'];
-  const dstOpts = dstIsUsingSrtp ? srtpOpts : rtpCopy;
-  const srcOpts = srcIsUsingSrtp ? srtpOpts : rtpCopy;
+  const srtpOpts = teams ? srtpCharacteristics['teams'] : srtpCharacteristics['default'];
+  const dstOpts = dstIsUsingSrtp ? srtpOpts : rtpCharacteristics;
+  const srcOpts = srcIsUsingSrtp ? srtpOpts : rtpCharacteristics;

-  /* Allow Feature server to inject DTMF to both leg except call from Teams*/
-  if (!teams) {
+  /* webrtc clients (e.g. sipjs) send DMTF via SIP INFO */
+  if ((srcIsUsingSrtp || dstIsUsingSrtp) && !teams) {
    dstOpts.flags.push('inject DTMF');
    srcOpts.flags.push('inject DTMF');
  }
  const common = {
    'call-id': req.get('Call-ID'),
-    'replace': ['origin', 'session-connection'],
-    'record call': process.env.JAMBONES_RECORD_ALL_CALLS ? 'yes' : 'no'
+    'replace': ['origin', 'session-connection']
  };
  return {
    common,
@@ -45,9 +39,6 @@ function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, teams = false) {
  };
 }

-const SdpWantsSDES = (sdp) => {
-  return /m=audio.*\s+RTP\/SAVP/.test(sdp);
-};
 const SdpWantsSrtp = (sdp) => {
  return /m=audio.*SAVP/.test(sdp);
 };
@@ -78,35 +69,18 @@ const  systemHealth = async(redisClient, ping, getCount) => {
  return getCount();
 };

-const doListen = (logger, app, port, resolve) => {
-  return app.listen(port, () => {
-    logger.info(`Health check server listening on http://localhost:${port}`);
-    resolve(app);
-  });
-};
-const handleErrors = (logger, app, resolve, reject, e) => {
-  if (e.code === 'EADDRINUSE' &&
-    process.env.HTTP_PORT_MAX &&
-    e.port < process.env.HTTP_PORT_MAX) {
-
-    logger.info(`Health check server failed to bind port on ${e.port}, will try next port`);
-    const server = doListen(logger, app, ++e.port, resolve);
-    server.on('error', handleErrors.bind(null, logger, app, resolve, reject));
-    return;
-  }
-  reject(e);
-};
-
-
 const createHealthCheckApp = (port, logger) => {
+  const express = require('express');
  const app = express();

  app.use(express.urlencoded({ extended: true }));
  app.use(express.json());

-  return new Promise((resolve, reject) => {
-    const server = doListen(logger, app, port, resolve);
-    server.on('error', handleErrors.bind(null, logger, app, resolve, reject));
+  return new Promise((resolve) => {
+    app.listen(port, () => {
+      logger.info(`Health check server started at http://localhost:${port}`);
+      resolve(app);
+    });
  });
 };

@@ -180,33 +154,10 @@ const parseConnectionIp = (sdp) => {
  return arr ? arr[1] : null;
 };

-/**
- * Checks if ip is one of MS Teams sip signalling ips
- * https://learn.microsoft.com/en-us/azure/communication-services/concepts
- * /telephony/direct-routing-infrastructure#sip-signaling-fqdns
- * @param ip IP address, example 172.31.0.1
- * */
-const isMSTeamsCIDR = (ip) => {
-  const cidrs = [
-    '52.112.0.0/14',
-    '52.120.0.0/14'
-  ];
-  const matcher = new CIDRMatcher(cidrs);
-  return matcher.contains(ip);
-};
-
-const isPrivateVoipNetwork = (ip) => {
-  if (process.env.PRIVATE_VOIP_NETWORK_CIDR) {
-    const matcher = new CIDRMatcher(process.env.PRIVATE_VOIP_NETWORK_CIDR.split(','));
-    return matcher.contains(ip);
-  }
-  return false;
-};

 module.exports = {
  isWSS,
  SdpWantsSrtp,
-  SdpWantsSDES,
  getAppserver,
  makeRtpEngineOpts,
  makeAccountCallCountKey,
@@ -218,7 +169,5 @@ module.exports = {
  createHealthCheckApp,
  nudgeCallCounts,
  roundTripTime,
-  parseConnectionIp,
-  isMSTeamsCIDR,
-  isPrivateVoipNetwork
+  parseConnectionIp
 };
@@ -1,6 +1,6 @@
 {
  "name": "sbc-inbound",
-  "version": "0.8.5",
+  "version": "v0.7.6",
  "main": "app.js",
  "engines": {
    "node": ">= 12.0.0"
@@ -20,28 +20,29 @@
  },
  "scripts": {
    "start": "node app",
-    "test": "NODE_ENV=test HTTP_PORT=3050 JAMBONES_NETWORK_CIDR='127.0.0.1/32' JAMBONES_HOSTING=1 JWT_SECRET=foobarbazzle SBC_ACCOUNT_SID=ed649e33-e771-403a-8c99-1780eabbc803 JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=localhost JAMBONES_REDIS_PORT=16379 JAMBONES_LOGLEVEL=error DRACHTIO_SECRET=cymru DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 JAMBONES_RTPENGINES=127.0.0.1:12222 JAMBONES_FEATURE_SERVERS=172.38.0.11 node test/ ",
+    "test": "NODE_ENV=test HTTP_PORT=3050 JAMBONES_NETWORK_CIDR='127.0.0.1/32' JAMBONES_HOSTING=1 SBC_ACCOUNT_SID=ed649e33-e771-403a-8c99-1780eabbc803 JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=localhost JAMBONES_REDIS_PORT=16379 JAMBONES_LOGLEVEL=error DRACHTIO_SECRET=cymru DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 JAMBONES_RTPENGINES=127.0.0.1:12222 JAMBONES_FEATURE_SERVERS=172.38.0.11 node test/ ",
    "coverage": "./node_modules/.bin/nyc --reporter html --report-dir ./coverage npm run test",
    "jslint": "eslint app.js lib"
  },
  "dependencies": {
-    "@jambonz/db-helpers": "^0.9.3",
+    "@jambonz/db-helpers": "^0.6.19",
+    "@jambonz/http-authenticator": "^0.2.2",
    "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/realtimedb-helpers": "^0.8.7",
-    "@jambonz/rtpengine-utils": "^0.4.4",
-    "@jambonz/siprec-client-utils": "^0.2.6",
-    "@jambonz/stats-collector": "^0.1.9",
-    "@jambonz/time-series": "^0.2.5",
-    "@jambonz/digest-utils": "^0.0.3",
-    "@aws-sdk/client-sns": "^3.360.0",
-    "@aws-sdk/client-auto-scaling": "^3.360.0",
+    "@jambonz/realtimedb-helpers": "^0.4.29",
+    "@jambonz/rtpengine-utils": "^0.3.6",
+    "@jambonz/siprec-client-utils": "^0.1.4",
+    "@jambonz/stats-collector": "^0.1.6",
+    "@jambonz/time-series": "^0.2.4",
+    "aws-sdk": "^2.1152.0",
    "bent": "^7.3.12",
    "cidr-matcher": "^2.1.1",
    "debug": "^4.3.4",
    "drachtio-fn-b2b-sugar": "0.0.12",
-    "drachtio-srf": "^4.5.31",
+    "drachtio-srf": "^4.5.1",
    "express": "^4.18.1",
    "pino": "^7.11.0",
+    "sdp-transform": "^2.14.1",
+    "uuid": "^8.3.2",
    "verify-aws-sns-signature": "^0.1.0",
    "xml2js": "^0.4.23"
  },
@@ -4,12 +4,12 @@ SET FOREIGN_KEY_CHECKS=0;

 DROP TABLE IF EXISTS account_static_ips;

-DROP TABLE IF EXISTS account_limits;
-
 DROP TABLE IF EXISTS account_products;

 DROP TABLE IF EXISTS account_subscriptions;

+DROP TABLE IF EXISTS account_limits;
+
 DROP TABLE IF EXISTS beta_invite_codes;

 DROP TABLE IF EXISTS call_routes;
@@ -20,8 +20,6 @@ DROP TABLE IF EXISTS lcr_carrier_set_entry;

 DROP TABLE IF EXISTS lcr_routes;

-DROP TABLE IF EXISTS password_settings;
-
 DROP TABLE IF EXISTS predefined_sip_gateways;

 DROP TABLE IF EXISTS predefined_smpp_gateways;
@@ -40,10 +38,10 @@ DROP TABLE IF EXISTS sbc_addresses;

 DROP TABLE IF EXISTS ms_teams_tenants;

-DROP TABLE IF EXISTS service_provider_limits;
-
 DROP TABLE IF EXISTS signup_history;

+DROP TABLE IF EXISTS service_provider_limits;
+
 DROP TABLE IF EXISTS smpp_addresses;

 DROP TABLE IF EXISTS speech_credentials;
@@ -75,15 +73,6 @@ private_ipv4 VARBINARY(16) NOT NULL UNIQUE ,
 PRIMARY KEY (account_static_ip_sid)
 );

-CREATE TABLE account_limits
-(
-account_limits_sid CHAR(36) NOT NULL UNIQUE ,
-account_sid CHAR(36) NOT NULL,
-category ENUM('api_rate','voice_call_session', 'device','voice_call_minutes','voice_call_session_license', 'voice_call_minutes_license') NOT NULL,
-quantity INTEGER NOT NULL,
-PRIMARY KEY (account_limits_sid)
-);
-
 CREATE TABLE account_subscriptions
 (
 account_subscription_sid CHAR(36) NOT NULL UNIQUE ,
@@ -103,6 +92,15 @@ pending_reason VARBINARY(52),
 PRIMARY KEY (account_subscription_sid)
 );

+CREATE TABLE account_limits
+(
+account_limits_sid CHAR(36) NOT NULL UNIQUE ,
+account_sid CHAR(36) NOT NULL,
+category ENUM('api_rate','voice_call_session', 'device') NOT NULL,
+quantity INTEGER NOT NULL,
+PRIMARY KEY (account_limits_sid)
+);
+
 CREATE TABLE beta_invite_codes
 (
 invite_code CHAR(6) NOT NULL UNIQUE ,
@@ -138,13 +136,6 @@ priority INTEGER NOT NULL UNIQUE  COMMENT 'lower priority routes are attempted f
 PRIMARY KEY (lcr_route_sid)
 ) COMMENT='Least cost routing table';

-CREATE TABLE password_settings
-(
-min_password_length INTEGER NOT NULL DEFAULT 8,
-require_digit BOOLEAN NOT NULL DEFAULT false,
-require_special_character BOOLEAN NOT NULL DEFAULT false
-);
-
 CREATE TABLE predefined_carriers
 (
 predefined_carrier_sid CHAR(36) NOT NULL UNIQUE ,
@@ -250,15 +241,6 @@ tenant_fqdn VARCHAR(255) NOT NULL UNIQUE ,
 PRIMARY KEY (ms_teams_tenant_sid)
 ) COMMENT='A Microsoft Teams customer tenant';

-CREATE TABLE service_provider_limits
-(
-service_provider_limits_sid CHAR(36) NOT NULL UNIQUE ,
-service_provider_sid CHAR(36) NOT NULL,
-category ENUM('api_rate','voice_call_session', 'device','voice_call_minutes','voice_call_session_license', 'voice_call_minutes_license') NOT NULL,
-quantity INTEGER NOT NULL,
-PRIMARY KEY (service_provider_limits_sid)
-);
-
 CREATE TABLE signup_history
 (
 email VARCHAR(255) NOT NULL,
@@ -267,6 +249,15 @@ signed_up_at DATETIME DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (email)
 );

+CREATE TABLE service_provider_limits
+(
+service_provider_limits_sid CHAR(36) NOT NULL UNIQUE ,
+service_provider_sid CHAR(36) NOT NULL,
+category ENUM('api_rate','voice_call_session', 'device') NOT NULL,
+quantity INTEGER NOT NULL,
+PRIMARY KEY (service_provider_limits_sid)
+);
+
 CREATE TABLE smpp_addresses
 (
 smpp_address_sid CHAR(36) NOT NULL UNIQUE ,
@@ -314,7 +305,6 @@ email_activation_code VARCHAR(16),
 email_validated BOOLEAN NOT NULL DEFAULT false,
 phone_validated BOOLEAN NOT NULL DEFAULT false,
 email_content_opt_out BOOLEAN NOT NULL DEFAULT false,
-is_active BOOLEAN NOT NULL DEFAULT true,
 PRIMARY KEY (user_sid)
 );

@@ -342,9 +332,6 @@ smpp_password VARCHAR(64),
 smpp_enquire_link_interval INTEGER DEFAULT 0,
 smpp_inbound_system_id VARCHAR(255),
 smpp_inbound_password VARCHAR(64),
-register_from_user VARCHAR(128),
-register_from_domain VARCHAR(255),
-register_public_ip_in_contact BOOLEAN NOT NULL DEFAULT false,
 PRIMARY KEY (voip_carrier_sid)
 ) COMMENT='A Carrier or customer PBX that can send or receive calls';

@@ -465,12 +452,12 @@ CREATE INDEX account_static_ip_sid_idx ON account_static_ips (account_static_ip_
 CREATE INDEX account_sid_idx ON account_static_ips (account_sid);
 ALTER TABLE account_static_ips ADD FOREIGN KEY account_sid_idxfk (account_sid) REFERENCES accounts (account_sid);

-CREATE INDEX account_sid_idx ON account_limits (account_sid);
-ALTER TABLE account_limits ADD FOREIGN KEY account_sid_idxfk_1 (account_sid) REFERENCES accounts (account_sid) ON DELETE CASCADE;
-
 CREATE INDEX account_subscription_sid_idx ON account_subscriptions (account_subscription_sid);
 CREATE INDEX account_sid_idx ON account_subscriptions (account_sid);
-ALTER TABLE account_subscriptions ADD FOREIGN KEY account_sid_idxfk_2 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE account_subscriptions ADD FOREIGN KEY account_sid_idxfk_1 (account_sid) REFERENCES accounts (account_sid);
+
+CREATE INDEX account_sid_idx ON account_limits (account_sid);
+ALTER TABLE account_limits ADD FOREIGN KEY account_sid_idxfk_2 (account_sid) REFERENCES accounts (account_sid) ON DELETE CASCADE;

 CREATE INDEX invite_code_idx ON beta_invite_codes (invite_code);
 CREATE INDEX call_route_sid_idx ON call_routes (call_route_sid);
@@ -525,10 +512,10 @@ ALTER TABLE ms_teams_tenants ADD FOREIGN KEY account_sid_idxfk_7 (account_sid) R
 ALTER TABLE ms_teams_tenants ADD FOREIGN KEY application_sid_idxfk_1 (application_sid) REFERENCES applications (application_sid);

 CREATE INDEX tenant_fqdn_idx ON ms_teams_tenants (tenant_fqdn);
+CREATE INDEX email_idx ON signup_history (email);
 CREATE INDEX service_provider_sid_idx ON service_provider_limits (service_provider_sid);
 ALTER TABLE service_provider_limits ADD FOREIGN KEY service_provider_sid_idxfk_3 (service_provider_sid) REFERENCES service_providers (service_provider_sid) ON DELETE CASCADE;

-CREATE INDEX email_idx ON signup_history (email);
 CREATE INDEX smpp_address_sid_idx ON smpp_addresses (smpp_address_sid);
 CREATE INDEX service_provider_sid_idx ON smpp_addresses (service_provider_sid);
 ALTER TABLE smpp_addresses ADD FOREIGN KEY service_provider_sid_idxfk_4 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
@@ -9,8 +9,7 @@ insert into webhooks(webhook_sid, url, username, password) values('90dda62e-0ea2

 insert into service_providers (service_provider_sid, name, root_domain, registration_hook_sid) 
 values ('3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', 'SP A', 'jambonz.org', '90dda62e-0ea2-47d1-8164-5bd49003476c');
-insert into service_provider_limits (service_provider_limits_sid, service_provider_sid, category, quantity) 
-values ('a79d3ade-e0da-4461-80f3-7c73f01e18b4', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', 'voice_call_session', 1);
+insert into service_provider_limits (service_provider_limits_sid, service_provider_sid, category, quantity) VALUES ('a79d3ade-e0da-4461-80f3-7c73f01e18b4', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', 'voice_call_session', 1);

 insert into accounts(account_sid, service_provider_sid, name, sip_realm, registration_hook_sid, webhook_secret)
 values ('ed649e33-e771-403a-8c99-1780eabbc803', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', 'test account', 'jambonz.org', '90dda62e-0ea2-47d1-8164-5bd49003476c', 'foobar');
@@ -67,25 +66,4 @@ insert into phone_numbers (phone_number_sid, number, voip_carrier_sid, account_s
 values ('d458bf7a-bcea-47b2-ac96-66dfc9c5c220', '150822233*', '287c1452-620d-4195-9f19-c9814ef90d78', 'ed649e33-e771-403a-8c99-1780eabbc803');

 insert into phone_numbers (phone_number_sid, number, voip_carrier_sid, account_sid)
-values ('f7ad205d-b92f-4363-8160-f8b5216b40d3', '15083871234', '287c1452-620d-4195-9f19-c9814ef90d78', 'd7cc37cb-d152-49ef-a51b-485f6e917089');
-
-- two accounts that both have the same carrier with default routing (ambiguity test)
-insert into accounts (account_sid, name, service_provider_sid, webhook_secret, sip_realm)
-values ('239d7d49-b3e4-4fdb-9d66-661149f717e8', 'Account B1', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', 'foobar', 'echo2.sip.jambonz.org');
-insert into accounts (account_sid, name, service_provider_sid, webhook_secret, sip_realm)
-values ('909d7d49-b3e4-4fdb-9d66-661149f717e8', 'Account B2', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', 'foobar', 'foxtrot.sip.jambonz.org');
-
-insert into applications (application_sid, name, account_sid, call_hook_sid, call_status_hook_sid)
-values ('8843e39f-4346-4218-8434-a53130e8be49', 'test', '239d7d49-b3e4-4fdb-9d66-661149f717e8', '90dda62e-0ea2-47d1-8164-5bd49003476c', '4d7ce0aa-5ead-4e61-9a6b-3daa732218b1');
-insert into applications (application_sid, name, account_sid, call_hook_sid, call_status_hook_sid)
-values ('7743e39f-4346-4218-8434-a53130e8be49', 'test', '909d7d49-b3e4-4fdb-9d66-661149f717e8', '90dda62e-0ea2-47d1-8164-5bd49003476c', '4d7ce0aa-5ead-4e61-9a6b-3daa732218b1');
-
-insert into voip_carriers (voip_carrier_sid, name, service_provider_sid, account_sid, application_sid) 
-values ('731abdc7-0220-4964-bc66-32b5c70cd9ab', 'twilio-1', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', '239d7d49-b3e4-4fdb-9d66-661149f717e8', '8843e39f-4346-4218-8434-a53130e8be49');
-insert into voip_carriers (voip_carrier_sid, name, service_provider_sid, account_sid, application_sid) 
-values ('987abdc7-0220-4964-bc66-32b5c70cd9ab', 'twilio-2', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', '909d7d49-b3e4-4fdb-9d66-661149f717e8', '7743e39f-4346-4218-8434-a53130e8be49');
-
-insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
-values ('664a5339-c62c-4075-9e19-f4de70a96597', '731abdc7-0220-4964-bc66-32b5c70cd9ab', '172.38.0.40', true, false);
-insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
-values ('554a5339-c62c-4075-9e19-f4de70a96597', '987abdc7-0220-4964-bc66-32b5c70cd9ab', '172.38.0.40', true, false);
+values ('f7ad205d-b92f-4363-8160-f8b5216b40d3', '15083871234', '287c1452-620d-4195-9f19-c9814ef90d78', 'd7cc37cb-d152-49ef-a51b-485f6e917089');
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="UAC with media">
-  <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
-  <!-- generated by sipp. To do so, use [call_id] keyword.                -->
-  <send retrans="500">
-    <![CDATA[
-
-      INVITE sip:+15083871234@172.38.0.10 SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
-      To: <sip:15083871234@172.38.0.10>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:sipp@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: uac-pcap-carrier-fail-ambiguous
-      Content-Type: application/sdp
-      Content-Length: [len]
-
-      v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-      s=-
-      c=IN IP[local_ip_type] [local_ip]
-      t=0 0
-      m=audio [auto_media_port] RTP/AVP 8 101
-      a=rtpmap:8 PCMA/8000
-      a=rtpmap:101 telephone-event/8000
-      a=fmtp:101 0-11,16
-
-    ]]>
-  </send>
-
-  <recv response="100" optional="true">
-  </recv>
-
-
-  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
-  <!-- are saved and used for following messages sent. Useful to test   -->
-  <!-- against stateful SIP proxies/B2BUAs.                             -->
-  <recv response="503" rtd="true" crlf="true">
-  </recv>
-
-  <!-- Packet lost can be simulated in any send/recv message by         -->
-  <!-- by adding the 'lost = "10"'. Value can be [1-100] percent.       -->
-  <send>
-    <![CDATA[
-
-      ACK sip:15083871234@172.38.0.10 SIP/2.0
-      [last_Via]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
-      To: <sip:15083871234@172.38.0.10>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Max-Forwards: 70
-      Subject: uac-pcap-carrier-fail-ambiguous
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-
-  <!-- definition of the response time repartition table (unit is ms)   -->
-  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
-  <!-- definition of the call length repartition table (unit is ms)     -->
-  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
-</scenario>
@@ -36,8 +36,6 @@
      Subject: uac-pcap-carrier-success
      Content-Type: application/sdp
      Content-Length: [len]
-      X-Authenticated-User: xhoaluu@jambonz.org
-      X-Application-Sid: APP_ID_1

      v=0
      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
@@ -33,6 +33,7 @@ test('incoming call tests', async(t) => {
    t.ok(obj.calls === 0, 'HTTP GET / works (current call count)')
    obj = await getJSON('http://127.0.0.1:3050/system-health');
    t.ok(obj.calls === 0, 'HTTP GET /system-health works (health check)')
+
    await sippUac('uac-pcap-carrier-success.xml', '172.38.0.20');
    t.pass('incoming call from carrier completed successfully');

@@ -58,16 +59,11 @@ test('incoming call tests', async(t) => {
    t.pass('handles in-dialog requests');
  
    await sippUac('uac-pcap-carrier-max-call-limit.xml', '172.38.0.20');
-    t.pass('rejects incoming call with 503 when max calls per account reached');
-
-    /* switch off this env for remaining tests (JAMBONES_HOSTING is for Saas sts) */
-    delete process.env.JAMBONES_HOSTING;
-    await sippUac('uac-pcap-carrier-fail-ambiguous.xml', '172.38.0.40');
-    t.pass('rejects incoming call with 503 when multiple accounts have same carrier witrh default routing')
+    t.pass('rejects incoming call with 503 when max calls per account reached')
  
    await waitFor(12);
    const res = await queryCdrs({account_sid: 'ed649e33-e771-403a-8c99-1780eabbc803'});
-    //console.log(`cdrs: ${JSON.stringify(res)}`);
+    console.log(`cdrs: ${JSON.stringify(res)}`);
    t.ok(7 === res.total, 'successfully wrote 7 cdrs for calls');

    srf.disconnect();