on REFER from fs, remove incoming Contact header before sending onward

wip
detect wss transport
2026-10-04 02:04:22 +00:00 · 2024-10-03 10:35:59 -04:00 · 2024-09-25 15:26:55 -04:00 · 2024-09-25 15:24:34 -04:00 · 2024-09-19 10:36:42 -04:00
25 changed files with 6295 additions and 2071 deletions
@@ -0,0 +1 @@
+test/*
@@ -0,0 +1,126 @@
+{
+  "env": {
+    "node": true,
+    "es6": true  
+  },
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": false,
+      "modules": false
+    },
+    "ecmaVersion": 2020
+  },
+  "plugins": ["promise"],
+  "rules": {
+    "promise/always-return": "error",
+    "promise/no-return-wrap": "error",
+    "promise/param-names": "error",
+    "promise/catch-or-return": "error",
+    "promise/no-native": "off",
+    "promise/no-nesting": "warn",
+    "promise/no-promise-in-callback": "warn",
+    "promise/no-callback-in-promise": "warn",
+    "promise/no-return-in-finally": "warn",
+
+    // Possible Errors
+    // http://eslint.org/docs/rules/#possible-errors
+    "comma-dangle": [2, "only-multiline"],
+    "no-control-regex": 2,
+    "no-debugger": 2,
+    "no-dupe-args": 2,
+    "no-dupe-keys": 2,
+    "no-duplicate-case": 2,
+    "no-empty-character-class": 2,
+    "no-ex-assign": 2,
+    "no-extra-boolean-cast" : 2,
+    "no-extra-parens": [2, "functions"],
+    "no-extra-semi": 2,
+    "no-func-assign": 2,
+    "no-invalid-regexp": 2,
+    "no-irregular-whitespace": 2,
+    "no-negated-in-lhs": 2,
+    "no-obj-calls": 2,
+    "no-proto": 2,
+    "no-unexpected-multiline": 2,
+    "no-unreachable": 2,
+    "use-isnan": 2,
+    "valid-typeof": 2,
+
+    // Best Practices
+    // http://eslint.org/docs/rules/#best-practices
+    "no-fallthrough": 2,
+    "no-octal": 2,
+    "no-redeclare": 2,
+    "no-self-assign": 2,
+    "no-unused-labels": 2,
+
+    // Strict Mode
+    // http://eslint.org/docs/rules/#strict-mode
+    "strict": [2, "never"],
+
+    // Variables
+    // http://eslint.org/docs/rules/#variables
+    "no-delete-var": 2,
+    "no-undef": 2,
+    "no-unused-vars": [2, {"args": "none"}],
+
+    // Node.js and CommonJS
+    // http://eslint.org/docs/rules/#nodejs-and-commonjs
+    "no-mixed-requires": 2,
+    "no-new-require": 2,
+    "no-path-concat": 2,
+    "no-restricted-modules": [2, "sys", "_linklist"],
+
+    // Stylistic Issues
+    // http://eslint.org/docs/rules/#stylistic-issues
+    "comma-spacing": 2,
+    "eol-last": 2,
+    "indent": [2, 2, {"SwitchCase": 1}],
+    "keyword-spacing": 2,
+    "max-len": [2, 120, 2],
+    "new-parens": 2,
+    "no-mixed-spaces-and-tabs": 2,
+    "no-multiple-empty-lines": [2, {"max": 2}],
+    "no-trailing-spaces": [2, {"skipBlankLines": false }],
+    "quotes": [2, "single", "avoid-escape"],
+    "semi": 2,
+    "space-before-blocks": [2, "always"],
+    "space-before-function-paren": [2, "never"],
+    "space-in-parens": [2, "never"],
+    "space-infix-ops": 2,
+    "space-unary-ops": 2,
+
+    // ECMAScript 6
+    // http://eslint.org/docs/rules/#ecmascript-6
+    "arrow-parens": [2, "always"],
+    "arrow-spacing": [2, {"before": true, "after": true}],
+    "constructor-super": 2,
+    "no-class-assign": 2,
+    "no-confusing-arrow": 2,
+    "no-const-assign": 2,
+    "no-dupe-class-members": 2,
+    "no-new-symbol": 2,
+    "no-this-before-super": 2,
+    "prefer-const": 2
+  },
+  "globals": {
+    "DTRACE_HTTP_CLIENT_REQUEST"           : false,
+    "LTTNG_HTTP_CLIENT_REQUEST"            : false,
+    "COUNTER_HTTP_CLIENT_REQUEST"          : false,
+    "DTRACE_HTTP_CLIENT_RESPONSE"          : false,
+    "LTTNG_HTTP_CLIENT_RESPONSE"           : false,
+    "COUNTER_HTTP_CLIENT_RESPONSE"         : false,
+    "DTRACE_HTTP_SERVER_REQUEST"           : false,
+    "LTTNG_HTTP_SERVER_REQUEST"            : false,
+    "COUNTER_HTTP_SERVER_REQUEST"          : false,
+    "DTRACE_HTTP_SERVER_RESPONSE"          : false,
+    "LTTNG_HTTP_SERVER_RESPONSE"           : false,
+    "COUNTER_HTTP_SERVER_RESPONSE"         : false,
+    "DTRACE_NET_STREAM_END"                : false,
+    "LTTNG_NET_STREAM_END"                 : false,
+    "COUNTER_NET_SERVER_CONNECTION_CLOSE"  : false,
+    "DTRACE_NET_SERVER_CONNECTION"         : false,
+    "LTTNG_NET_SERVER_CONNECTION"          : false,
+    "COUNTER_NET_SERVER_CONNECTION"        : false  
+  }
+}
@@ -1,10 +1,10 @@
-FROM --platform=linux/amd64 node:24-alpine AS base
+FROM --platform=linux/amd64 node:20.13.0-alpine3.18 as base

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

 WORKDIR /opt/app/

-FROM base AS build
+FROM base as build

 COPY package.json package-lock.json ./

@@ -18,6 +18,6 @@ COPY --from=build /opt/app /opt/app/

 ARG NODE_ENV

-ENV NODE_ENV=$NODE_ENV
+ENV NODE_ENV $NODE_ENV

 CMD [ "node", "app.js" ]
@@ -67,19 +67,12 @@ const {
 }, logger);
 const {
  client: redisClient,
-  addKey,
-  deleteKey,
-  retrieveKey,
-  retrieveHash,
  createSet,
  retrieveSet,
  addToSet,
  removeFromSet,
  incrKey,
-  decrKey,
-  createEphemeralGateway,
-  queryEphemeralGateways
-} = require('@jambonz/realtimedb-helpers')({}, logger);
+  decrKey} = require('@jambonz/realtimedb-helpers')({}, logger);

 const ngProtocol = process.env.JAMBONES_NG_PROTOCOL || 'udp';
 const ngPort = process.env.RTPENGINE_PORT || ('udp' === ngProtocol ? 22222 : 8080);
@@ -115,16 +108,10 @@ srf.locals = {...srf.locals,
    lookupSystemInformation
  },
  realtimeDbHelpers: {
-    addKey,
-    deleteKey,
-    retrieveKey,
-    retrieveHash,
    createSet,
    incrKey,
    decrKey,
-    retrieveSet,
-    createEphemeralGateway,
-    queryEphemeralGateways
+    retrieveSet
  }
 };
 const {
@@ -132,8 +119,7 @@ const {
  wasOriginatedFromCarrier,
  getApplicationForDidAndCarrier,
  getOutboundGatewayForRefer,
-  getApplicationBySid,
-  lookupAuthCarriersForAccountAndSP
+  getApplicationBySid
 } = require('./lib/db-utils')(srf, logger);
 srf.locals = {
  ...srf.locals,
@@ -142,8 +128,7 @@ srf.locals = {
  getApplicationForDidAndCarrier,
  getOutboundGatewayForRefer,
  getFeatureServer: require('./lib/fs-tracking')(srf, logger),
-  getApplicationBySid,
-  lookupAuthCarriersForAccountAndSP
+  getApplicationBySid
 };
 const activeCallIds = srf.locals.activeCallIds;

@@ -152,8 +137,7 @@ const {
  handleSipRec,
  identifyAccount,
  checkLimits,
-  challengeDeviceCalls,
-  identifyAuthTrunk
+  challengeDeviceCalls
 } = require('./lib/middleware')(srf, logger);
 const CallSession = require('./lib/call-session');

@@ -241,9 +225,7 @@ srf.use('invite', [
  handleSipRec,
  identifyAccount,
  checkLimits,
-  challengeDeviceCalls,
-  // challengeDeviceCalls will detect auth_trunk or device calls, identifyAuthTrunk have to be after that
-  identifyAuthTrunk
+  challengeDeviceCalls
 ]);

 srf.invite((req, res) => {
@@ -305,9 +287,6 @@ if ('test' !== process.env.NODE_ENV) {
        logger.info(`updating private network cidr from ${srf.locals.privateNetworkCidr} to ${r.private_network_cidr}`);
        srf.locals.privateNetworkCidr = r.private_network_cidr;
      }
-      if (r.log_level) {
-        logger.level = r.log_level;
-      }
    }
  }, 20000);
 }
@@ -3,6 +3,6 @@
  "DTLS": "off",
  "SDES": "off",
  "ICE": "remove",
-  "flags": ["port latching"],
+  "flags": ["media handover", "port latching"],
  "rtcp-mux": ["accept"]
 }
@@ -3,14 +3,14 @@
    "transport-protocol": "UDP/TLS/RTP/SAVPF",
    "ICE": "default",
    "SDES": "off",
-    "flags": ["generate mid", "SDES-no", "port latching"],
+    "flags": ["generate mid", "SDES-no", "media handover", "port latching"],
    "rtcp-mux": ["require"]  
  },
  "teams": {
    "transport-protocol": "RTP/SAVP",
    "ICE": "default",
    "SDES": "off",
-    "flags": ["generate mid", "SDES-no", "port latching"],
+    "flags": ["generate mid", "SDES-no", "media handover", "port latching"],
    "rtcp-mux": ["accept"]
  }
 }
@@ -1,137 +0,0 @@
-const promisePlugin = require('eslint-plugin-promise');
-
-module.exports = [
-  {
-    ignores: ['test/*']
-  },
-  {
-    files: ['**/*.js'],
-    languageOptions: {
-      ecmaVersion: 2020,
-      sourceType: 'commonjs',
-      globals: {
-        // Node.js globals
-        console: 'readonly',
-        process: 'readonly',
-        Buffer: 'readonly',
-        __dirname: 'readonly',
-        __filename: 'readonly',
-        module: 'readonly',
-        require: 'readonly',
-        exports: 'readonly',
-        setTimeout: 'readonly',
-        clearTimeout: 'readonly',
-        setInterval: 'readonly',
-        clearInterval: 'readonly',
-        setImmediate: 'readonly',
-        clearImmediate: 'readonly',
-        // DTrace/LTTNG globals
-        DTRACE_HTTP_CLIENT_REQUEST: false,
-        LTTNG_HTTP_CLIENT_REQUEST: false,
-        COUNTER_HTTP_CLIENT_REQUEST: false,
-        DTRACE_HTTP_CLIENT_RESPONSE: false,
-        LTTNG_HTTP_CLIENT_RESPONSE: false,
-        COUNTER_HTTP_CLIENT_RESPONSE: false,
-        DTRACE_HTTP_SERVER_REQUEST: false,
-        LTTNG_HTTP_SERVER_REQUEST: false,
-        COUNTER_HTTP_SERVER_REQUEST: false,
-        DTRACE_HTTP_SERVER_RESPONSE: false,
-        LTTNG_HTTP_SERVER_RESPONSE: false,
-        COUNTER_HTTP_SERVER_RESPONSE: false,
-        DTRACE_NET_STREAM_END: false,
-        LTTNG_NET_STREAM_END: false,
-        COUNTER_NET_SERVER_CONNECTION_CLOSE: false,
-        DTRACE_NET_SERVER_CONNECTION: false,
-        LTTNG_NET_SERVER_CONNECTION: false,
-        COUNTER_NET_SERVER_CONNECTION: false
-      }
-    },
-    plugins: {
-      promise: promisePlugin
-    },
-    rules: {
-      // Promise plugin rules
-      'promise/always-return': 'error',
-      'promise/no-return-wrap': 'error',
-      'promise/param-names': 'error',
-      'promise/catch-or-return': 'error',
-      'promise/no-native': 'off',
-      'promise/no-nesting': 'warn',
-      'promise/no-promise-in-callback': 'warn',
-      'promise/no-callback-in-promise': 'warn',
-      'promise/no-return-in-finally': 'warn',
-
-      // Possible Errors
-      'comma-dangle': [2, 'only-multiline'],
-      'no-control-regex': 2,
-      'no-debugger': 2,
-      'no-dupe-args': 2,
-      'no-dupe-keys': 2,
-      'no-duplicate-case': 2,
-      'no-empty-character-class': 2,
-      'no-ex-assign': 2,
-      'no-extra-boolean-cast': 2,
-      'no-extra-parens': [2, 'functions'],
-      'no-extra-semi': 2,
-      'no-func-assign': 2,
-      'no-invalid-regexp': 2,
-      'no-irregular-whitespace': 2,
-      'no-obj-calls': 2,
-      'no-proto': 2,
-      'no-unexpected-multiline': 2,
-      'no-unreachable': 2,
-      'use-isnan': 2,
-      'valid-typeof': 2,
-
-      // Best Practices
-      'no-fallthrough': 2,
-      'no-octal': 2,
-      'no-redeclare': 2,
-      'no-self-assign': 2,
-      'no-unused-labels': 2,
-
-      // Strict Mode
-      'strict': [2, 'never'],
-
-      // Variables
-      'no-delete-var': 2,
-      'no-undef': 2,
-      'no-unused-vars': [2, {args: 'none'}],
-
-      // Node.js and CommonJS
-      'no-mixed-requires': 2,
-      'no-new-require': 2,
-      'no-path-concat': 2,
-
-      // Stylistic Issues
-      'comma-spacing': 2,
-      'eol-last': 2,
-      'indent': [2, 2, {SwitchCase: 1}],
-      'keyword-spacing': 2,
-      'max-len': [2, 120, 2],
-      'new-parens': 2,
-      'no-mixed-spaces-and-tabs': 2,
-      'no-multiple-empty-lines': [2, {max: 2}],
-      'no-trailing-spaces': [2, {skipBlankLines: false}],
-      'quotes': [2, 'single', 'avoid-escape'],
-      'semi': 2,
-      'space-before-blocks': [2, 'always'],
-      'space-before-function-paren': [2, 'never'],
-      'space-in-parens': [2, 'never'],
-      'space-infix-ops': 2,
-      'space-unary-ops': 2,
-
-      // ECMAScript 6
-      'arrow-parens': [2, 'always'],
-      'arrow-spacing': [2, {before: true, after: true}],
-      'constructor-super': 2,
-      'no-class-assign': 2,
-      'no-confusing-arrow': 2,
-      'no-const-assign': 2,
-      'no-dupe-class-members': 2,
-      'no-new-symbol': 2,
-      'no-this-before-super': 2,
-      'prefer-const': 2
-    }
-  }
-];
@@ -8,7 +8,7 @@ module.exports = (logger) => {
  // listen for SNS lifecycle changes
  let lifecycleEmitter = new Emitter();
  lifecycleEmitter.dryUpCalls = false;
-  if (process.env.AWS_SNS_TOPIC_ARN) {
+  if (process.env.AWS_SNS_TOPIC_ARM) {

    (async function() {
      try {
@@ -69,17 +69,7 @@ class SnsNotifier extends Emitter {
            subscriptionRequestId: this.subscriptionRequestId
          }, 'response from SNS SubscribeURL');
          const data = await this.describeInstance();
-
-          const group = data.AutoScalingGroups.find((group) =>
-            group.Instances && group.Instances.some((instance) => instance.InstanceId === this.instanceId)
-          );
-          if (!group) {
-            this.logger.error('Current instance not found in any Auto Scaling group', data);
-          } else {
-            const instance = group.Instances.find((instance) => instance.InstanceId === this.instanceId);
-            this.lifecycleState = instance.LifecycleState;
-          }
-
+          this.lifecycleState = data.AutoScalingGroups[0].Instances[0].LifecycleState;
          this.emit('SubscriptionConfirmation', {publicIp: this.publicIp});
          break;

@@ -147,13 +137,13 @@ class SnsNotifier extends Emitter {
    try {
      const params = {
        Protocol: 'http',
-        TopicArn: process.env.AWS_SNS_TOPIC_ARN,
+        TopicArn: process.env.AWS_SNS_TOPIC_ARM,
        Endpoint: this.snsEndpoint
      };
      const response = await snsClient.send(new SubscribeCommand(params));
-      this.logger.info({response}, `response to SNS subscribe to ${process.env.AWS_SNS_TOPIC_ARN}`);
+      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_ARN}`);
+      this.logger.error({err}, `Error subscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARM}`);
    }
  }

@@ -164,9 +154,9 @@ class SnsNotifier extends Emitter {
        SubscriptionArn: this.subscriptionArn
      };
      const response = await snsClient.send(new UnsubscribeCommand(params));
-      this.logger.info({response}, `response to SNS unsubscribe to ${process.env.AWS_SNS_TOPIC_ARN}`);
+      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_ARN}`);
+      this.logger.error({err}, `Error unsubscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARM}`);
    }
  }

@@ -8,10 +8,8 @@ const {
  roundTripTime,
  parseConnectionIp,
  isPrivateVoipNetwork,
-  makeFullMediaReleaseKey,
-  makePartnerFullMediaReleaseKey
+  isWSS,
 } = require('./utils');
-const { MediaPath } = require('./constants.json');

 const {forwardInDialogRequests} = require('drachtio-fn-b2b-sugar');
 const {parseUri, stringifyUri, SipError} = require('drachtio-srf');
@@ -64,17 +62,17 @@ class CallSession extends Emitter {
    this.activeCallIds = this.srf.locals.activeCallIds;

    this.decrKey = req.srf.locals.realtimeDbHelpers.decrKey;
-    this.addKey = req.srf.locals.realtimeDbHelpers.addKey;
-    this.retrieveKey = req.srf.locals.realtimeDbHelpers.retrieveKey;
-    this.retrieveHash = req.srf.locals.realtimeDbHelpers.retrieveHash;
-
-    this._mediaPath = MediaPath.FullMedia;
+    this._mediaReleased = false;

    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 = [];
    this.recordingNoAnswerTimeout = (process.env.JAMBONES_RECORDING_NO_ANSWER_TIMEOUT || 2) * 1000;
+
+    this.isUsingPrivateNetwork = isPrivateVoipNetwork(this.req.source_address);
+
+    this.protocol = isWSS(req) ? 'wss' : req.protocol;
  }

  get isFromMSTeams() {
@@ -86,7 +84,12 @@ class CallSession extends Emitter {
  }

  get isMediaReleased() {
-    return this._mediaPath !== MediaPath.FullMedia;
+    return this._mediaReleased;
+  }
+
+  get callerIsUsingSrtp() {
+    const tp = this.rtpEngineOpts?.uas?.mediaOpts['transport-protocol'];
+    return tp && -1 !== tp.indexOf('SAVP');
  }

  get isFive9VoiceStream() {
@@ -109,8 +112,7 @@ class CallSession extends Emitter {

  async connect() {
    const {sdp} = this.req.locals;
-    const is3pcc = this.req.body?.length === 0;
-    this.logger.info(`inbound ${is3pcc ? '3pcc ' : ''}call accepted for routing`);
+    this.logger.info('inbound call accepted for routing');
    const engine = this.getRtpEngine();
    if (!engine) {
      this.logger.info('No available rtpengines, rejecting call!');
@@ -181,17 +183,17 @@ class CallSession extends Emitter {
      host = obj.host;
      proxy = `sip:${featureServer}`;
    }
-    if (obj.user) uri = `sip:${obj.user}@${host}`;
-    else uri = `sip:${host}`;
+    if (obj.user) uri = `${scheme}:${obj.user}@${host}`;
+    else uri = `${scheme}:${host}`;
    this.logger.info(`uri will be: ${uri}, proxy ${proxy}`);

-    const sendOfferToRtpEngine = async(remoteSdp) => {
+    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: remoteSdp
+        direction:  [this.isUsingPrivateNetwork ? 'private' : 'public', 'private'],
+        sdp
      };
      const startAt = process.hrtime();
      const response = await this.offer(opts);
@@ -204,11 +206,7 @@ class CallSession extends Emitter {
        this.logger.error({}, `rtpengine offer failed with ${JSON.stringify(response)}`);
        throw new Error('rtpengine failed: answer');
      }
-      return response;
-    };

-    try {
-      const response = await sendOfferToRtpEngine(sdp);
      let headers = {
        'From': createBLegFromHeader(this.req),
        'To': this.req.get('To'),
@@ -218,13 +216,9 @@ class CallSession extends Emitter {
      };
      if (this.privateSipAddress) headers = {...headers, Contact: `<sip:${this.privateSipAddress}>`};

-      let spdOfferB;
-      if (this.siprec && this.xml) {
-        spdOfferB = createSiprecBody(headers, response.sdp, this.xml.type, this.xml.content);
-      }
-      else if (!is3pcc) {
-        spdOfferB = response.sdp;
-      }
+      const spdOfferB = this.siprec && this.xml ?
+        createSiprecBody(headers, response.sdp, this.xml.type, this.xml.content) :
+        response.sdp;

      if (this.req.locals.carrier) {
        Object.assign(headers, {
@@ -235,8 +229,8 @@ class CallSession extends Emitter {

      // set Contact header based on scenario, and transport protocol
      let responseHeaders = {};
-      if (isPrivateVoipNetwork(this.req.source_address)) {
-        this.contactHeader = `<${scheme}:${this.privateSipAddress};transport=${this.req.protocol}>`;
+      if (this.isUsingPrivateNetwork) {
+        this.contactHeader = `<${scheme}:${this.privateSipAddress};transport=${this.protocol}>`;
        responseHeaders = {
          ...responseHeaders,
          'Contact': this.contactHeader
@@ -253,8 +247,8 @@ class CallSession extends Emitter {
        };
      }
      else {
-        const hostport = this.srf.locals.sbcPublicIpAddress[this.req.protocol];
-        this.contactHeader = `<${scheme}:${hostport};transport=${this.req.protocol}>`;
+        const hostport = this.srf.locals.sbcPublicIpAddress[this.protocol];
+        this.contactHeader = `<${scheme}:${hostport};transport=${this.protocol}>`;
        responseHeaders = {
          ...responseHeaders,
          'Contact': this.contactHeader
@@ -291,10 +285,7 @@ class CallSession extends Emitter {
          '-X-Authenticated-User'
        ],
        proxyResponseHeaders: ['all', '-X-Trace-ID'],
-        localSdpB: spdOfferB ? spdOfferB : async(ackBody) => {
-          const response = await sendOfferToRtpEngine(ackBody);
-          return response.sdp;
-        },
+        localSdpB: spdOfferB,
        localSdpA: async(sdp, res) => {
          this.rtpEngineOpts.uac.tag = res.getParsedHeader('To').params.tag;
          const opts = {
@@ -305,12 +296,8 @@ class CallSession extends Emitter {
            sdp
          };
          const startAt = process.hrtime();
-          const aOpts = {
-            ...opts,
-            ...(is3pcc && {direction: ['private', 'public']})
-          };
-          const response = await this.answer(aOpts);
-          this.logger.debug({response, opts: aOpts}, 'response from rtpengine to answer');
+          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}`]);
@@ -330,18 +317,9 @@ class CallSession extends Emitter {
          }

          return response.sdp;
-        },
+        }
      });

-      // passing gateway outbound auth that sbc-inbound can send RE-INVITE with authentication process on UAS side
-      const {gateway} = this.req.locals;
-      if (gateway && gateway.register_username && gateway.register_password) {
-        this.logger.debug('passing outbound gateway auth to CallSession for reinvite processing');
-        uas.auth = {
-          username: gateway.register_username,
-          password: gateway.register_password
-        };
-      }
      // successfully connected
      this.logger.info('call connected successfully to feature server');
      debug('call connected successfully to feature server');
@@ -357,16 +335,7 @@ class CallSession extends Emitter {
        this.emit('failed');
      }
      else if (err.message !== 'call canceled') {
-        const {writeCallCount, writeCallCountSP, writeCallCountApp} = this.req.srf.locals;
        this.logger.error(err, 'unexpected error routing inbound call');
-        nudgeCallCounts(this.req, 'failure', {
-          service_provider_sid: this.service_provider_sid,
-          account_sid: this.account_sid,
-          application_sid: this.application_sid,
-          callId: this.req.locals.callId
-        }, this.decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp})
-          .catch((err) => this.logger.error(err, 'Error decrementing call counts'));
-
      }
      this.srf.endSession(this.req);
    }
@@ -433,14 +402,6 @@ class CallSession extends Emitter {
        trace_id: uac.res?.get('X-Trace-ID') || '00000000000000000000000000000000'
      };
    }
-
-    /* save far end SDP for later use if we do a full media release */
-    if (process.env.JAMBONES_ENABLE_FULL_MEDIA_RELEASE) {
-      const key = makeFullMediaReleaseKey(this.req.get('Call-ID'));
-      const sdp = this.req.body;
-      this.logger.info({key, sdp}, 'saving far end sdp for full media release feature');
-      this.addKey(key, sdp, 3600).catch((err) => this.logger.error(err, 'Error saving far end sdp'));
-    }
    this.uas = uas;
    this.uac = uac;
    [uas, uac].forEach((dlg) => {
@@ -462,7 +423,7 @@ class CallSession extends Emitter {
            if (!IMMUTABLE_HEADERS.includes(h)) headers[h] = bye.headers[h];
          });
          await other.destroy({headers});
-        } catch {}
+        } catch (err) {}
        this.unsubscribeForDTMF();


@@ -472,17 +433,12 @@ class CallSession extends Emitter {

        if (process.env.JAMBONES_HOSTING || trackingOn) {
          const {writeCallCount, writeCallCountSP, writeCallCountApp} = this.req.srf.locals;
-          if (!this.req.locals.callCountNudged) {
-            this.req.locals.callCountNudged = true;
-            this.logger.debug('decrementing call count at end of call');
-            await nudgeCallCounts(this.req, 'complete', {
-              service_provider_sid: this.service_provider_sid,
-              account_sid: this.account_sid,
-              application_sid: this.application_sid,
-              callId: this.req.locals.callId
-            }, this.decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp})
-              .catch((err) => this.logger.error(err, 'Error decrementing call counts'));
-          }
+          await nudgeCallCounts(this.logger, {
+            service_provider_sid: this.service_provider_sid,
+            account_sid: this.account_sid,
+            application_sid: this.application_sid
+          }, this.decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp})
+            .catch((err) => this.logger.error(err, 'Error decrementing call counts'));
        }

        /* write cdr for connected call */
@@ -492,9 +448,7 @@ class CallSession extends Emitter {
            this.req.locals.carrier :
            this.req.locals.originator;
          const application = await this.srf.locals.getApplicationBySid(application_sid);
-          const {hasRecording} = await this.retrieveHash(`call:${this.account_sid}:${call_sid}`) ?? {};
-          const isRecording = this.req.locals.account.record_all_calls ||
-          (application && application.record_all_calls) || hasRecording;
+          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')}`;
@@ -657,7 +611,6 @@ Duration=${payload.duration} `
    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 isFullMediaRelease = reason === 'release-media-entirely' && process.env.JAMBONES_ENABLE_FULL_MEDIA_RELEASE;
    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'];
@@ -719,26 +672,6 @@ Duration=${payload.duration} `
        }
        return;
      }
-
-      if (isFullMediaRelease) {
-        const b_sdp = await this.retrieveKey(makePartnerFullMediaReleaseKey(this.req.get('Call-ID')));
-        this.logger.info({b_sdp}, 'reinvite ourselves out of the media path with this reinvite offer');
-        const answerSdp = await dlg.other.modify(b_sdp);
-        this.logger.info({answerSdp}, 'far end response to full media release');
-        res.send(200, {
-          body: dlg.local.sdp,
-          headers: {
-            'Contact': this.contactHeader
-          }
-        });
-        /* no media going through us now we can destroy the rtpengine resource */
-        this.rtpEngineResource.destroy().catch((err) => {
-          this.logger.info({err}, 'Error destroying rtpengine resource after full media release');
-        });
-        this._mediaPath = MediaPath.NoMedia;
-        return;
-      }
-
      const offeredSdp = Array.isArray(req.payload) && req.payload.length > 1 ?
        req.payload.find((p) => p.type === 'application/sdp').content :
        req.body;
@@ -766,16 +699,12 @@ Duration=${payload.duration} `

      /* if this is a re-invite from the FS to change media anchoring, avoid sending the reinvite out */
      let sdp;
-      //HL 2024-11-13: previously forwarded re-invites to webrtc clients but further testing has shown to be unnecessary
-      //if (isReleasingMedia && !this.callerIsUsingSrtp) {
-
-      //DH 2024-11- 18: if we are going from no-media to either partial or full media, we need reinvite the far end
-      if (isReleasingMedia && this._mediaPath !== MediaPath.NoMedia) {
+      if (isReleasingMedia && !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');
-        this._mediaPath = 'release-media' === reason ? MediaPath.PartialMedia : MediaPath.FullMedia;
-        this.logger.debug(`media path is now ${this._mediaPath}`);
+        this._mediaReleased = 'release-media' === reason;
      }
      else {
        sdp = await dlg.other.modify(response.sdp);
@@ -876,8 +805,7 @@ Duration=${payload.duration} `
              blockMedia: this.blockMedia,
              unblockMedia: this.unblockMedia,
              unsubscribe: this.unsubscribe,
-              headers,
-              isSipRecCall: Array.isArray(this.req.payload) && this.req.payload.length > 1
+              headers
            }));
            try {
              this._startRecordingNoAnswerTimer(res);
@@ -959,13 +887,11 @@ Duration=${payload.duration} `
          const code = arr[1];
          const arr2 = /Duration=\s*(\d+)/.exec(req.body);
          const duration = arr2 ? arr2[1] : 250;
-          const volume = 13;
          const dtmfOpts = {
            ...this.rtpEngineOpts.common,
            'from-tag': this.rtpEngineOpts.uac.tag,
            code,
-            duration,
-            volume
+            duration
          };
          const response = await this.playDTMF(dtmfOpts);
          if ('ok' !== response.result) {
@@ -1039,7 +965,9 @@ Duration=${payload.duration} `
      if (!arr) {
        /* call transfer requested */
        const {gateway} = this.req.locals;
-        if (!req.has('Referred-By')) return res.send(400);
+        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');
@@ -1069,18 +997,21 @@ Duration=${payload.duration} `
        // 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,
+          'content-length':contentlength, 'refer-to':_referto, 'referred-by':_referredby,
          // eslint-disable-next-line no-unused-vars
-          'X-Refer-To-Leave-Untouched': _leave, contact: _contact,
+          'X-Refer-To-Leave-Untouched': _leave, 'contact':_contact,
          ...customHeaders
        } = req.headers;

+        if (this.isUsingPrivateNetwork && this.privateSipAddress) {
+          u.host = this.privateSipAddress;
+        }
        const response = await this.uas.request({
          method: 'REFER',
          headers: {
            'Refer-To': `<${stringifyUri(uri)}>`,
-            'Referred-By': referredby,
-            'Contact': this.contactHeader,
+            'Referred-By': `<${stringifyUri(u)}>`,
+            ...(this.contactHeader && {'Contact': this.contactHeader}),
            ...customHeaders
          }
        });
@@ -3,10 +3,5 @@
    "ScaleIn": "scale-in",
    "StandbyEnter": "standby-enter",
    "StandbyExit": "standby-exit"
-  },
-  "MediaPath": {
-    "NoMedia": "no-media",
-    "PartialMedia": "partial-media",
-    "FullMedia": "full-media"
  }
 }
@@ -7,8 +7,7 @@ const sqlSelectSPForAccount = 'SELECT service_provider_sid FROM accounts WHERE a

 const sqlSelectAllCarriersForAccountByRealm =
 `SELECT sg.sip_gateway_sid, sg.voip_carrier_sid, vc.name, vc.account_sid,  
-vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto,
-vc.register_username, vc.register_password
+vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto
 FROM sip_gateways sg, voip_carriers vc, accounts acc 
 WHERE acc.sip_realm = ? 
 AND vc.account_sid = acc.account_sid 
@@ -18,8 +17,7 @@ AND sg.voip_carrier_sid = vc.voip_carrier_sid`;

 const sqlSelectAllCarriersForSPByRealm =
 `SELECT sg.sip_gateway_sid, sg.voip_carrier_sid, vc.name, vc.account_sid,  
-vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto,
-vc.register_username, vc.register_password
+vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto
 FROM sip_gateways sg, voip_carriers vc, accounts acc 
 WHERE acc.sip_realm = ? 
 AND vc.service_provider_sid = acc.service_provider_sid  
@@ -30,14 +28,23 @@ 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, sg.pad_crypto,
-vc.register_username, vc.register_password
+vc.account_sid, vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto
 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`;

+const sqlCarriersForAccountBySid =
+`SELECT sg.sip_gateway_sid, sg.voip_carrier_sid, vc.name, vc.account_sid,  
+vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto
+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 sqlAccountBySid = 'SELECT * from accounts WHERE account_sid = ?';
 const sqlApplicationBySid = 'SELECT * from applications WHERE application_sid = ?';
@@ -59,35 +66,15 @@ 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, sg.pad_crypto,
-vc.register_username, vc.register_password
-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 = ?
+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, sg.pad_crypto
+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 sqlSelectAuthCarriersForAccountAndSP = `
-SELECT * FROM voip_carriers 
-WHERE trunk_type = 'auth' 
-AND is_active = 1 
-AND (
-  (account_sid = ?) 
-  OR 
-  (service_provider_sid = ? AND account_sid IS NULL)
-)`;
-
-const sqlSelectGatewaysByVoipCarrierSids = `
-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, sg.pad_crypto,
-vc.register_username, vc.register_password
-FROM sip_gateways sg, voip_carriers vc
-WHERE sg.voip_carrier_sid IN (?)
-AND sg.voip_carrier_sid = vc.voip_carrier_sid
-AND vc.is_active = 1`;
-
 const gatewayMatchesSourceAddress = (logger, source_address, gw) => {
  if (32 === gw.netmask && gw.ipv4 === source_address) return true;
  if (gw.netmask < 32) {
@@ -103,7 +90,6 @@ const gatewayMatchesSourceAddress = (logger, source_address, gw) => {

 module.exports = (srf, logger) => {
  const {pool}  = srf.locals.dbHelpers;
-  const {queryEphemeralGateways} = srf.locals.realtimeDbHelpers;
  const pp = pool.promise();

  const getApplicationBySid = async(application_sid) => {
@@ -131,22 +117,6 @@ module.exports = (srf, logger) => {
    }
  };

-  /**
-   * Retrieves the application for a given DID (phone number) and carrier combination.
-   * First attempts an exact DID match, then falls back to pattern/wildcard matching
-   * if no exact match is found. Pattern matching is done in order of pattern length
-   * (longest/most specific first) and handles both regex and wildcard (*) patterns.
-   *
-   * @param {Object} req - The request object containing the called number
-   * @param {string} voip_carrier_sid - The SID of the VoIP carrier
-   * @returns {Promise<(string|Object|null)>} Returns either:
-   *   - application_sid (string) if appObject is false
-   *   - full application object if appObject is true
-   *   - null if no matching application is found
-   * @throws {Error} Database errors or other unexpected errors
-   */
-  // Refactored to handle invalid regular expressions gracefully as part of
-  // https://github.com/jambonz/sbc-inbound/issues/201
  const getApplicationForDidAndCarrier = async(req, voip_carrier_sid) => {
    const did = normalizeDID(req.calledNumber) || 'anonymous';

@@ -157,117 +127,17 @@ module.exports = (srf, logger) => {

      /* wildcard / regex match */
      const [r2] = await pp.query(sqlQueryAllDidsForCarrier, [voip_carrier_sid]);
-      const patterns = r2
+      const match = r2
        .filter((o) => o.number.match(/\D/))                  // look at anything with non-digit characters
-        .sort((a, b) => b.number.length - a.number.length);
-      for (const pattern of patterns) {
-        try {
-          const regexPattern = pattern.number.endsWith('*') ?
-            `${pattern.number.slice(0, -1)}\\d*` :
-            pattern.number;
-          if (did.match(new RegExp(regexPattern))) {
-            logger.debug({voip_carrier_sid, 'pattern':pattern.number, 'did':did}, 'Found a matching pattern');
-            return pattern.application_sid;
-          }
-        } catch (err) {
-          logger.warn({err, voip_carrier_sid, pattern: pattern.number}, 'Invalid regex pattern encountered - skipping');
-          continue;
-        }
-      }
-      logger.debug({voip_carrier_sid, did}, 'No matching pattern found');
+        .sort((a, b) => b.number.length - a.number.length)    // prefer longest match
+        .find((o) => did.match(new RegExp(o.number.endsWith('*') ? `${o.number.slice(0, -1)}\\d*` : o.number)));
+      if (match) return match.application_sid;
      return null;
    } catch (err) {
      logger.error({err}, 'getApplicationForDidAndCarrier');
    }
  };

-  /**
-   * Searches for a matching application across multiple carriers using pattern/wildcard matching.
-   * This function is similar to getApplicationForDidAndCarrier but operates on multiple carriers
-   * simultaneously for better performance. It searches through all patterns from the specified
-   * carriers, ordered by pattern length (longest/most specific first).
-   *
-   * @param {Object} req - The request object containing the called number
-   * @param {string} voip_carrier_sids - Comma-separated string of carrier SIDs, formatted for SQL IN clause
-   *                                     (e.g., "'carrier1','carrier2'")
-   * @returns {Promise<Object|null>} Returns either:
-   *   - The matching phone_numbers record containing application_sid, voip_carrier_sid, and account_sid
-   *   - null if no matching pattern is found
-   * @throws {Error} Database errors or other unexpected errors
-   */
-  const getApplicationForDidAndCarriers = async(req, voip_carrier_sids) => {
-    const did = normalizeDID(req.calledNumber) || 'anonymous';
-    const sql = `SELECT * FROM phone_numbers WHERE voip_carrier_sid IN (${voip_carrier_sids})`;
-
-    try {
-      /* wildcard / regex match */
-      const [r2] = await pp.query(sql);
-      const patterns = r2
-        .filter((o) => o.number.match(/\D/))                  // look at anything with non-digit characters
-        .sort((a, b) => b.number.length - a.number.length);
-      for (const pattern of patterns) {
-        try {
-          const regexPattern = pattern.number.endsWith('*') ?
-            `${pattern.number.slice(0, -1)}\\d*` :
-            pattern.number;
-          if (did.match(new RegExp(regexPattern))) {
-            logger.debug({'pattern':pattern.number, 'did':did}, 'Found a matching pattern');
-            return pattern;
-          }
-        } catch (err) {
-          logger.warn({err, pattern: pattern.number}, 'Invalid regex pattern encountered - skipping');
-          continue;
-        }
-      }
-      logger.debug('No matching pattern found');
-      return null;
-    } catch (err) {
-      logger.error({err}, 'getApplicationForDidAndCarriers');
-    }
-  };
-
-  /**
-   * Queries ephemeral gateways in Redis for the given source IP address.
-   * Returns an array of active voip_carrier_sid values.
-   *
-   * @param {string} source_address - The source IP address to query
-   * @returns {Promise<Array<string>>} Array of voip_carrier_sid values, or empty array on error
-   */
-  const lookupEphemeralGatewayCarriers = async(source_address) => {
-    try {
-      logger.debug({source_address}, 'querying ephemeral gateways');
-      const carriers = await queryEphemeralGateways(source_address);
-      if (carriers.length > 0) {
-        logger.info({source_address, count: carriers.length, carriers},
-          'found ephemeral gateway carriers');
-      }
-      return carriers;
-    } catch (err) {
-      logger.error({err, source_address}, 'Error querying ephemeral gateways');
-      return [];
-    }
-  };
-
-  /**
-   * Retrieves full gateway details (with carrier info) for the given voip_carrier_sid array.
-   * Returns gateway records (joined with carrier data) matching the structure of other gateway queries.
-   *
-   * @param {Array<string>} voipCarrierSids - Array of voip_carrier_sid values
-   * @returns {Promise<Array<Object>>} Array of gateway objects (with carrier fields included)
-   */
-  const lookupGatewaysByCarrierSids = async(voipCarrierSids) => {
-    if (!voipCarrierSids || voipCarrierSids.length === 0) return [];
-
-    try {
-      const [r] = await pp.query(sqlSelectGatewaysByVoipCarrierSids, [voipCarrierSids]);
-      logger.debug({count: r.length, voipCarrierSids}, 'retrieved gateway details for ephemeral gateways');
-      return r;
-    } catch (err) {
-      logger.error({err, voipCarrierSids}, 'Error retrieving gateway details by carrier IDs');
-      return [];
-    }
-  };
-
  const wasOriginatedFromCarrier = async(req) => {
    const failure = {fromCarrier: false};
    const uri = parseUri(req.uri);
@@ -299,7 +169,7 @@ module.exports = (srf, logger) => {

        /* get all the carriers and gateways for the account owning this sip realm */
        const [gwAcc] = await pp.query(sqlSelectAllCarriersForAccountByRealm, [uri.host]);
-        const [gwSP] = await pp.query(sqlSelectAllCarriersForSPByRealm, uri.host);
+        const [gwSP] = gwAcc.length ? [[]] : await pp.query(sqlSelectAllCarriersForSPByRealm, uri.host);
        const gw = gwAcc
          .concat(gwSP)
          .sort((a, b) => b.netmask - a.netmask);
@@ -310,42 +180,13 @@ module.exports = (srf, logger) => {
            name: gw.name,
            service_provider_sid: gw.service_provider_sid,
            account_sid: gw.account_sid,
-            application_sid: gw.application_sid,
-            register_username: gw.register_username,
-            register_password: gw.register_password
+            application_sid: gw.application_sid
          };
        });
        /* remove duplicates, winnow down to voip_carriers, not gateways */
        if (voip_carriers.length > 1) {
          voip_carriers = [...new Set(voip_carriers.map(JSON.stringify))].map(JSON.parse);
        }
-
-        /* if no static gateway matches, check ephemeral gateways in Redis */
-        if (voip_carriers.length === 0 && gateways.length === 0) {
-          const ephemeralCarrierSids = await lookupEphemeralGatewayCarriers(req.source_address);
-          if (ephemeralCarrierSids.length > 0) {
-            const ephemeralGateways = await lookupGatewaysByCarrierSids(ephemeralCarrierSids);
-            gateways.push(...ephemeralGateways);
-            voip_carriers = ephemeralGateways.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,
-                register_username: gw.register_username,
-                register_password: gw.register_password
-              };
-            });
-            /* remove duplicates */
-            if (voip_carriers.length > 1) {
-              voip_carriers = [...new Set(voip_carriers.map(JSON.stringify))].map(JSON.parse);
-            }
-            logger.info({source_address: req.source_address, count: voip_carriers.length},
-              'matched call to ephemeral gateway(s) from registration trunk');
-          }
-        }
-
        if (voip_carriers.length) {
          /* we have one or more matches.  Now check for one with a provisioned phone number matching the DID */
          const vc_sids = voip_carriers.map((m) => `'${m.voip_carrier_sid}'`).join(',');
@@ -353,31 +194,9 @@ module.exports = (srf, logger) => {
            `SELECT * FROM phone_numbers WHERE number = '${did}'
            AND voip_carrier_sid IN (${vc_sids})
            AND account_sid = '${a[0].account_sid}'`;
-          //logger.debug({voip_carriers, sql, did}, 'looking up DID');
+          logger.debug({voip_carriers, sql, did}, 'looking up DID');

          const [r] = await pp.query(sql);
-          if (r.length === 0) {
-            // if no matching phone number is found, find whether there are any applications having phone numbers
-            // matching the regex pattern or wild card
-            logger.debug({isDotDecimal},
-              'Did not find a matching phone number, checking for applications with Regex or wildcard');
-            const vc_sids = voip_carriers.map((m) => `'${m.voip_carrier_sid}'`).join(',');
-            const application = await getApplicationForDidAndCarriers(req, vc_sids);
-            if (application) {
-              logger.debug({application}, 'sip_realm looking up DID: found application with Regex or wildcard ');
-              const gateway = gateways.find((m) => m.voip_carrier_sid === application.voip_carrier_sid);
-              // the gateway may belong to "all accounts", so we need to use the account_sid of the application
-              gateway.account_sid = gateway.account_sid ? gateway.account_sid : application.account_sid;
-              return {
-                fromCarrier: true,
-                gateway: gateway,
-                service_provider_sid: a[0].service_provider_sid,
-                account_sid: gateway.account_sid,
-                application_sid: application.application_sid,
-                account: a[0]
-              };
-            }
-          }
          if (r.length > 1) {
            logger.info({r},
              'multiple carriers with the same gateway have the same number provisioned for the same account'
@@ -429,7 +248,7 @@ module.exports = (srf, logger) => {
            `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');
+          logger.debug({matches: matches[0], sql, did}, 'looking up DID');

          const [r] = await pp.query(sql);
          return {
@@ -454,180 +273,124 @@ module.exports = (srf, logger) => {
      /* no match, so fall through  */
    }

-    /* find all carrier entries that have an inbound gateway matching the source IP */
-    const [gw] = await pp.query(sqlSelectAllGatewaysForSP);
-    //logger.debug({gw}, `checking gateways for source address ${req.source_address}`);
-    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,
-          pad_crypto: gw.pad_crypto,
-          register_username: gw.register_username,
-          register_password: gw.register_password
-        };
-      });
-    /* remove duplicates, winnow down to voip_carriers, not gateways */
-    if (matches.length > 1) {
-      matches = [...new Set(matches.map(JSON.stringify))].map(JSON.parse);
-    }
+    if (isDotDecimal && process.env.JAMBONES_HOSTING) {
+      if (!process.env.SBC_ACCOUNT_SID) return failure;

-    /* if no static gateway matches, check ephemeral gateways in Redis */
-    if (matches.length === 0) {
-      const ephemeralCarrierSids = await lookupEphemeralGatewayCarriers(req.source_address);
-      if (ephemeralCarrierSids.length > 0) {
-        const ephemeralGateways = await lookupGatewaysByCarrierSids(ephemeralCarrierSids);
-        matches = ephemeralGateways.map((gw) => {
+      /* 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,
-            pad_crypto: gw.pad_crypto,
-            register_username: gw.register_username,
-            register_password: gw.register_password
+            pad_crypto: gw.pad_crypto
          };
        });
-        /* remove duplicates */
-        if (matches.length > 1) {
-          matches = [...new Set(matches.map(JSON.stringify))].map(JSON.parse);
-        }
-        logger.info({source_address: req.source_address, count: matches.length},
-          'matched call to ephemeral gateway(s) from registration trunk');
+      /* remove duplicates, winnow down to voip_carriers, not gateways */
+      if (matches.length > 1) {
+        matches = [...new Set(matches.map(JSON.stringify))].map(JSON.parse);
      }
-    }
-
-    //logger.debug({matches}, `matches for source address ${req.source_address}`);
-    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) {
-        // if no matching phone number is found, find whether there are any applications having phone numbers
-        // matching the regex pattern or wild card
-        logger.debug({isDotDecimal},
-          'Did not find a matching phone number, checking for applications with Regex or wildcard');
+      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 application = await getApplicationForDidAndCarriers(req, vc_sids);
-        if (application) {
-          logger.debug({application}, 'looking up DID: found application with Regex or wildcard');
-          const gateway = matches.find((m) => m.voip_carrier_sid === application.voip_carrier_sid);
-          // the gateway may belong to "all accounts", so we need to use the account_sid of the application
-          const [a] = await pp.query(sqlAccountBySid, [application.account_sid]);
-          return {
-            fromCarrier: true,
-            gateway: gateway,
-            service_provider_sid: gateway.service_provider_sid,
-            account_sid: application.account_sid,
-            application_sid: application.application_sid,
-            account: a[0],
-          };
-        }
+        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');

-        /* 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
+        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 [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};
-          else {
-            const [accounts] = await pp.query('SELECT * from accounts where service_provider_sid = ?',
-              [matches[0].service_provider_sid]);
+          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,
-              gateway: matches[0],
-              service_provider_sid: accounts[0].service_provider_sid,
-              account_sid: accounts[0].account_sid,
+              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
+            */
+            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};
+            else {
+              const [accounts] = await pp.query('SELECT * from accounts where service_provider_sid = ?',
+                [matches[0].service_provider_sid]);
+              return {
+                fromCarrier: true,
+                gateway: matches[0],
+                service_provider_sid: accounts[0].service_provider_sid,
+                account_sid: accounts[0].account_sid,
+                account: accounts[0]
+              };
+            }
+          }
        }
-      }
-      else if (r.length > 1) {
-        logger.info({r},
-          'multiple accounts have added this carrier with default routing -- cannot determine which to use');
+        else if (r.length > 1) {
+          logger.info({r},
+            'multiple accounts have added this carrier with default routing -- cannot determine which to use');
+          return {
+            fromCarrier: true,
+            error: 'Multiple accounts are attempting to route the same phone number from the same carrier'
+          };
+        }
+
+        /* 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,
-          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;
  };

-  /**
-   * Retrieves voip_carriers with trunk_type 'auth' that belong to either:
-   * 1. The specified account (account_sid matches), OR
-   * 2. The service provider but with null account_sid (shared across service provider)
-   *
-   * @param {string} account_sid - The SID of the account
-   * @param {string} service_provider_sid - The SID of the service provider
-   * @returns {Promise<Array>} Array of voip_carrier records matching the criteria
-   * @throws {Error} Database errors or other unexpected errors
-   */
-  const lookupAuthCarriersForAccountAndSP = async(account_sid, service_provider_sid) => {
-    try {
-      const [rows] = await pp.query(sqlSelectAuthCarriersForAccountAndSP, [account_sid, service_provider_sid]);
-      return rows;
-    } catch (err) {
-      logger.error({err, account_sid, service_provider_sid}, 'lookupAuthCarriersForAccountAndSP');
-      throw err;
-    }
-  };
-
  return {
    wasOriginatedFromCarrier,
    getApplicationForDidAndCarrier,
-    getApplicationForDidAndCarriers,
    getOutboundGatewayForRefer,
    getSPForAccount,
-    getApplicationBySid,
-    lookupAuthCarriersForAccountAndSP
+    getApplicationBySid
  };
 };
@@ -28,14 +28,13 @@ module.exports = function(srf, logger) {
    lookupAccountBySipRealm,
    lookupAccountBySid,
    lookupAccountCapacitiesBySid,
-    queryCallLimits,
+    queryCallLimits
  }  = srf.locals.dbHelpers;
-  const {stats, writeCdrs, lookupAuthCarriersForAccountAndSP, getApplicationForDidAndCarrier} = srf.locals;
+  const {stats, writeCdrs} = srf.locals;

  const initLocals = (req, res, next) => {
    const callId = req.get('Call-ID');
    req.locals = req.locals || {callId};
-    req.locals.nudge = 0;

    /* check if forwarded by a proxy that applied an X-Forwarded-For Header */
    if (req.has('X-Forwarded-For') || req.has('X-Subspace-Forwarded-For')) {
@@ -131,11 +130,7 @@ module.exports = function(srf, logger) {
          return res.send(404, 'Number Not Provisioned');
        }
        logger.info({gateway}, 'identifyAccount: incoming call from gateway');
-        const appSidHeader = req.get('x-application-sid');
-        if (appSidHeader && appSidHeader == application_sid) {
-          logger.info({callId}, 'Loop Detected, x-application-sid header on incoming call matches applicationSid');
-          return res.send(482, 'Loop Detected on x-application-sid');
-        }
+
        let sid;
        if (siprec) {
          if (!account.siprec_hook_sid) {
@@ -191,10 +186,6 @@ module.exports = function(srf, logger) {
          res.send(404);
          return req.srf.endSession(req);
        }
-        const auth_trunks = await lookupAuthCarriersForAccountAndSP(
-          account.account_sid,
-          account.service_provider_sid
-        );

        /* if this is a dedicated SBC (static IP) only take calls for that account's sip realm */
        if (process.env.SBC_ACCOUNT_SID && account.account_sid !== process.env.SBC_ACCOUNT_SID) {
@@ -218,7 +209,6 @@ module.exports = function(srf, logger) {
            registration_hook_username: account.registration_hook.username,
            registration_hook_password: account.registration_hook.password
          }),
-          ...(auth_trunks?.length && {auth_trunks}),
          ...req.locals
        };
      }
@@ -245,8 +235,6 @@ module.exports = function(srf, logger) {
        callId: req.get('Call-ID'),
        service_provider_sid: req.locals.service_provider_sid,
        account_sid: req.locals.account_sid
-      }, {
-        ...(req.locals.account.enable_debug_log && {level: 'debug'})
      });

      next();
@@ -269,20 +257,13 @@ module.exports = function(srf, logger) {
    assert(account_sid);
    assert(service_provider_sid);

-    /* if quick cancel then we are done */
-    if (req.canceled) {
-      logger.info('checkLimits: call was immediately canceled, no need to increment call count as we are done');
-      return;
-    }
-
    /* decrement count if INVITE is later rejected */
    res.once('end', async({status}) => {
      if (status > 200) {
-        nudgeCallCounts(req, 'failure', {
+        nudgeCallCounts(logger, {
          service_provider_sid,
          account_sid,
-          application_sid,
-          callId: req.locals.callId
+          application_sid
        }, decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp})
          .catch((err) => logger.error(err, 'Error decrementing call counts'));
      }
@@ -290,11 +271,10 @@ module.exports = function(srf, logger) {

    try {
      /* increment the call count */
-      const  {callsSP, calls} = await nudgeCallCounts(req, 'init', {
+      const  {callsSP, calls} = await nudgeCallCounts(logger, {
        service_provider_sid,
        account_sid,
-        application_sid,
-        callId: req.locals.callId
+        application_sid
      }, incrKey, {writeCallCountSP, writeCallCount, writeCallCountApp});

      /* compare to account's limit, though avoid db hit when call count is low */
@@ -304,22 +284,24 @@ module.exports = function(srf, logger) {
      logger.debug(`checkLimits: call count is now ${calls}, limit is ${minLimit}`);
      if (calls <= minLimit) return next();

-      const accountCapacities = await lookupAccountCapacitiesBySid(account_sid);
-      const accountLimit = accountCapacities.find((c) => c.category == 'voice_call_session');
-      if (accountLimit) {
-        /* check account limit */
-        const limit_sessions = accountLimit.quantity;
-        if (calls > limit_sessions) {
-          debug(`checkLimits: limits exceeded: call count ${calls}, limit ${limit_sessions}`);
-          logger.info({calls, limit_sessions}, 'checkLimits: limits exceeded');
-          writeAlerts({
-            alert_type: AlertType.ACCOUNT_CALL_LIMIT,
-            service_provider_sid: account.service_provider_sid,
-            account_sid,
-            count: limit_sessions
-          }).catch((err) => logger.info({err}, 'checkLimits: error writing alert'));
-          res.send(503, 'Maximum Calls In Progress');
-          return req.srf.endSession(req);
+      if (process.env.JAMBONES_HOSTING) {
+        const accountCapacities = await lookupAccountCapacitiesBySid(account_sid);
+        const accountLimit = accountCapacities.find((c) => c.category == 'voice_call_session');
+        if (accountLimit) {
+          /* check account limit */
+          const limit_sessions = accountLimit.quantity;
+          if (calls > limit_sessions) {
+            debug(`checkLimits: limits exceeded: call count ${calls}, limit ${limit_sessions}`);
+            logger.info({calls, limit_sessions}, 'checkLimits: limits exceeded');
+            writeAlerts({
+              alert_type: AlertType.ACCOUNT_CALL_LIMIT,
+              service_provider_sid: account.service_provider_sid,
+              account_sid,
+              count: limit_sessions
+            }).catch((err) => logger.info({err}, 'checkLimits: error writing alert'));
+            res.send(503, 'Maximum Calls In Progress');
+            return req.srf.endSession(req);
+          }
        }
      }
      else if (trackingOn) {
@@ -340,11 +322,6 @@ module.exports = function(srf, logger) {
          });
          return req.srf.endSession(req);
        }
-        if (!account_limit && !sp_limit && process.env.JAMBONES_HOSTING) {
-          logger.info(`checkLimits: no active subscription found for account ${account_sid}, rejecting call`);
-          res.send(503, 'No Active Subscription');
-          return req.srf.endSession(req);
-        }
        if (process.env.JAMBONES_TRACK_SP_CALLS && sp_limit > 0 && callsSP > sp_limit) {
          logger.info({callsSP, sp_limit}, 'checkLimits: service provider limits exceeded');
          writeAlerts({
@@ -370,38 +347,6 @@ module.exports = function(srf, logger) {
    }
  };

-  const identifyAuthTrunk = async(req, res, next) => {
-    try {
-      if (req.authorization) {
-        const {grant} = req.authorization;
-        if (grant && grant.status === 'ok' && grant.auth_trunk) {
-          // we have successfully authenticated the call for an auth_trunk
-          const application_sid = await getApplicationForDidAndCarrier(req, grant.auth_trunk.voip_carrier_sid);
-
-          req.locals = {
-            ...req.locals,
-            originator: 'trunk',
-            carrier: grant.auth_trunk.name,
-            gateway: grant.auth_trunk,
-            voip_carrier_sid: grant.auth_trunk.voip_carrier_sid,
-            application_sid: application_sid || grant.auth_trunk.application_sid,
-          };
-          // as call from auth carrier, clean req.authorization that impact on legacy logic for authenticated user
-          delete req.authorization;
-
-          logger.debug({callId: req.locals.callId, auth_trunk: grant.auth_trunk.name},
-            'identifyAuthTrunk: call authenticated for auth trunk');
-        }
-      }
-      next();
-    } catch (err) {
-      stats.increment('sbc.terminations', ['sipStatus:500']);
-      logger.error(err, `${req.get('Call-ID')} Error challenging auth trunk`);
-      res.send(500);
-      req.srf.endSession(req);
-    }
-  };
-
  const challengeDeviceCalls = async(req, res, next) => {
    try {
      /* TODO: check if this is a gateway that we have an ACL for */
@@ -420,7 +365,6 @@ module.exports = function(srf, logger) {
    handleSipRec,
    challengeDeviceCalls,
    identifyAccount,
-    identifyAuthTrunk,
    checkLimits
  };
 };
@@ -9,6 +9,11 @@ const isWSS = (req) => {
  return req.getParsedHeader('Via')[0].protocol.toLowerCase().startsWith('ws');
 };

+const localSipPort = (req) => {
+  const arr = /:(\d+)$/.exec(req.receivedOn);
+  return arr ? arr[1] : '5060';
+};
+
 const getAppserver = (srf) => {
  const len = srf.locals.featureServers.length;
  return srf.locals.featureServers[idx++ % len];
@@ -30,21 +35,11 @@ function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, teams = false) {
    dstOpts.flags.push('inject DTMF');
    srcOpts.flags.push('inject DTMF');
  }
-
-  /** By default, and for backwards compatibility, use media handover
-   * set env var to true to use strict source instead (needed for rtpbleed vulnerability)
-   */
-  const enableStrictSource = !!process.env.RTPENGINE_ENABLE_STRICT_SOURCE;
-  dstOpts.flags.push(enableStrictSource ? 'strict source' : 'media handover');
-  srcOpts.flags.push(enableStrictSource ?  'strict source' : 'media handover');
-  const acceptCodecs = process.env.JAMBONES_ACCEPT_AND_TRANSCODE ?
-    process.env.JAMBONES_ACCEPT_AND_TRANSCODE :
-    process.env.JAMBONES_ACCEPT_G729 ? 'g729' : '';
  const common = {
    'call-id': req.get('Call-ID'),
    'replace': ['origin', 'session-connection'],
    'record call': process.env.JAMBONES_RECORD_ALL_CALLS ? 'yes' : 'no',
-    ...(acceptCodecs && { codec: { mask: acceptCodecs, transcode: 'pcmu,pcma' } })
+    ...(process.env.JAMBONES_ACCEPT_G729 && { codec: { mask: 'g729', transcode: 'pcmu' } })
  };
  return {
    common,
@@ -124,97 +119,12 @@ const createHealthCheckApp = (port, logger) => {
  });
 };

-/**
- * nudgeCallCounts - increment or decrement call counts in redis
- *
- *              current nudge value
- * -----------------------------------------
- *  why    |     -1     |    0    |    1    |
- * -----------------------------------------
- *  init   |    no-op   |    +1   |    N/A  |
- * failure |    N/A     |    -1   |    -1   |
- * complete|    N/A     |    N/A  |    -1   |
- *
- *
- */
-
-const shouldNudge = (why, req) => {
-  const {nudge, logger} = req.locals;
-  let modifyCount = false;
-  const originalNudge = nudge;
-
-  switch (why) {
-    case 'init':
-      if (nudge === 0) {
-        // normal case: new call, increment call count
-        req.locals.nudge = 1;
-        modifyCount = true;
-      }
-      else if (nudge === -1) {
-        // extremely quick cancel, don't increment call count
-        req.locals.nudge = 0;
-      }
-      else {
-        logger.info(`shouldNudge: unexpected nudge value ${nudge} for ${why}`);
-      }
-      break;
-    case 'failure':
-      if (nudge === 1) {
-        // normal case of call failed for any reason, decrement call count
-        req.locals.nudge = 0;
-        modifyCount = true;
-      }
-      else if (nudge === 0) {
-        // very quick failure dont decrement call count
-        req.locals.nudge = -1;
-      }
-      else {
-        logger.info(`shouldNudge: unexpected nudge value ${nudge} for ${why}`);
-      }
-      break;
-    case 'complete':
-      if (nudge === 1) {
-        // normal case of call completed, decrement call count
-        req.locals.nudge = 0;
-        modifyCount = true;
-      }
-      else {
-        logger.info(`shouldNudge: unexpected nudge value ${nudge} for ${why}`);
-      }
-      break;
-    default:
-      logger.info(`shouldNudge: unexpected why value ${why}`);
-      break;
-  }
-
-  logger.info(`shouldNudge: '${why}': updating count: ${modifyCount}, nudge: ${originalNudge} -> ${req.locals.nudge}`);
-  return modifyCount;
-};
-
-const nudgeCallCounts = async(req, why, sids, nudgeOperator, writers) => {
-  const {logger} = req.locals;
-  const {service_provider_sid, account_sid, application_sid, callId} = sids;
-  const {writeCallCount, writeCallCountSP, writeCallCountApp} = writers;
+const nudgeCallCounts = async(logger, sids, nudgeOperator, writers) => {
+  const { service_provider_sid, account_sid, application_sid } = sids;
+  const { writeCallCount, writeCallCountSP, writeCallCountApp } = writers;
  const nudges = [];
  const writes = [];

-  if (!shouldNudge(why, req)) {
-    return {callsSP: null, calls: null, callsApp: null};
-  }
-
-  if (process.env.JAMBONES_DEBUG_CALL_COUNTS) {
-    const {srf} = require('..');
-    const {addKey, deleteKey} = srf.locals.realtimeDbHelpers;
-
-    if (why === 'init') {
-      // save for 3 days
-      await addKey(`debug:incalls:${account_sid}:${callId}`, new Date().toISOString(), 259200);
-    }
-    else {
-      await deleteKey(`debug:incalls:${account_sid}:${callId}`);
-    }
-  }
-
  if (process.env.JAMBONES_TRACK_SP_CALLS) {
    const key = makeSPCallCountKey(service_provider_sid);
    nudges.push(nudgeOperator(key));
@@ -243,28 +153,33 @@ const nudgeCallCounts = async(req, why, sids, nudgeOperator, writers) => {
    const [callsSP, calls, callsApp] = await Promise.all(nudges);
    logger.debug({
      calls, callsSP, callsApp,
-      service_provider_sid, account_sid, application_sid}, 'call counts after adjustment');
+      service_provider_sid, account_sid, application_sid
+    }, 'call counts after adjustment');
    if (process.env.JAMBONES_TRACK_SP_CALLS) {
-      writes.push(writeCallCountSP({service_provider_sid, calls_in_progress: callsSP}));
+      writes.push(writeCallCountSP({ service_provider_sid, calls_in_progress: callsSP }));
    }

    if (process.env.JAMBONES_TRACK_ACCOUNT_CALLS || process.env.JAMBONES_HOSTING) {
-      writes.push(writeCallCount({service_provider_sid, account_sid, calls_in_progress: calls}));
+      writes.push(writeCallCount({ service_provider_sid, account_sid, calls_in_progress: calls }));
    }

    if (process.env.JAMBONES_TRACK_APP_CALLS && application_sid) {
-      writes.push(writeCallCountApp({service_provider_sid, account_sid, application_sid, calls_in_progress: callsApp}));
+      writes.push(writeCallCountApp({
+        service_provider_sid,
+        account_sid, application_sid,
+        calls_in_progress: callsApp
+      }));
    }

    /* write the call counts to the database */
-    Promise.all(writes).catch((err) => logger.error({err}, 'Error writing call counts'));
+    Promise.all(writes).catch((err) => logger.error({ err }, 'Error writing call counts'));

-    return {callsSP, calls, callsApp};
+    return { callsSP, calls, callsApp };
  } catch (err) {
    logger.error(err, 'error incrementing call counts');
  }

-  return {callsSP: null, calls: null, callsApp: null};
+  return { callsSP: null, calls: null, callsApp: null };
 };

 const roundTripTime = (startAt) => {
@@ -333,12 +248,6 @@ const parseHostPorts = (logger, hostports, srf) => {
  return obj;
 };

-const makeFullMediaReleaseKey = (callId) => {
-  return `a_sdp:${callId}`;
-};
-const makePartnerFullMediaReleaseKey = (callId) => {
-  return `b_sdp:${callId}`;
-};

 module.exports = {
  isWSS,
@@ -359,7 +268,6 @@ module.exports = {
  isMSTeamsCIDR,
  isPrivateVoipNetwork,
  parseHostPorts,
-  makeFullMediaReleaseKey,
-  makePartnerFullMediaReleaseKey
+  localSipPort
 };

@@ -1,9 +1,9 @@
 {
  "name": "sbc-inbound",
-  "version": "0.9.5",
+  "version": "0.9.2",
  "main": "app.js",
  "engines": {
-    "node": ">= 20.0.0"
+    "node": ">= 18.0.0"
  },
  "keywords": [
    "sip",
@@ -26,30 +26,29 @@
    "jslint:fix": "npm run jslint --fix"
  },
  "dependencies": {
-    "@aws-sdk/client-auto-scaling": "^3.549.0",
-    "@aws-sdk/client-sns": "^3.549.0",
-    "@babel/helpers": "^7.26.10",
-    "@jambonz/db-helpers": "^0.9.18",
-    "@jambonz/digest-utils": "^0.0.9",
+    "@jambonz/db-helpers": "^0.9.7",
    "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/realtimedb-helpers": "^0.8.18",
+    "@jambonz/realtimedb-helpers": "^0.8.8",
    "@jambonz/rtpengine-utils": "^0.4.4",
-    "@jambonz/siprec-client-utils": "^0.2.10",
+    "@jambonz/siprec-client-utils": "^0.2.7",
    "@jambonz/stats-collector": "^0.1.10",
-    "@jambonz/time-series": "^0.2.10",
+    "@jambonz/time-series": "^0.2.8",
+    "@jambonz/digest-utils": "^0.0.5",
+    "@aws-sdk/client-sns": "^3.549.0",
+    "@aws-sdk/client-auto-scaling": "^3.549.0",
    "bent": "^7.3.12",
    "cidr-matcher": "^2.1.1",
-    "debug": "^4.4.3",
-    "drachtio-fn-b2b-sugar": "0.2.1",
-    "drachtio-srf": "^5.0.5",
-    "express": "^4.21.2",
-    "pino": "^10.1.0",
+    "debug": "^4.3.4",
+    "drachtio-fn-b2b-sugar": "0.1.0",
+    "drachtio-srf": "^4.5.38",
+    "express": "^4.19.2",
+    "pino": "^8.20.0",
    "verify-aws-sns-signature": "^0.1.0",
    "xml2js": "^0.6.2"
  },
  "devDependencies": {
-    "eslint": "^9.17.0",
-    "eslint-plugin-promise": "^7.2.1",
+    "eslint": "^7.32.0",
+    "eslint-plugin-promise": "^6.1.1",
    "nyc": "^15.1.0",
    "tape": "^5.7.5"
  }
@@ -14,6 +14,8 @@ DROP TABLE IF EXISTS beta_invite_codes;

 DROP TABLE IF EXISTS call_routes;

+DROP TABLE IF EXISTS clients;
+
 DROP TABLE IF EXISTS dns_records;

 DROP TABLE IF EXISTS lcr;
@@ -66,8 +68,6 @@ DROP TABLE IF EXISTS phone_numbers;

 DROP TABLE IF EXISTS sip_gateways;

-DROP TABLE IF EXISTS clients;
-
 DROP TABLE IF EXISTS voip_carriers;

 DROP TABLE IF EXISTS accounts;
@@ -132,6 +132,19 @@ application_sid CHAR(36) NOT NULL,
 PRIMARY KEY (call_route_sid)
 ) COMMENT='a regex-based pattern match for call routing';

+CREATE TABLE clients
+(
+client_sid CHAR(36) NOT NULL UNIQUE ,
+account_sid CHAR(36) NOT NULL,
+is_active BOOLEAN NOT NULL DEFAULT 1,
+username VARCHAR(64),
+password VARCHAR(1024),
+allow_direct_app_calling BOOLEAN NOT NULL DEFAULT 1,
+allow_direct_queue_calling BOOLEAN NOT NULL DEFAULT 1,
+allow_direct_user_calling BOOLEAN NOT NULL DEFAULT 1,
+PRIMARY KEY (client_sid)
+);
+
 CREATE TABLE dns_records
 (
 dns_record_sid CHAR(36) NOT NULL UNIQUE ,
@@ -338,8 +351,6 @@ speech_credential_sid CHAR(36) NOT NULL,
 model VARCHAR(512) NOT NULL,
 reported_usage ENUM('REPORTED_USAGE_UNSPECIFIED','REALTIME','OFFLINE') DEFAULT 'REALTIME',
 name VARCHAR(64) NOT NULL,
-voice_cloning_key MEDIUMTEXT,
-use_voice_cloning_key BOOLEAN DEFAULT false,
 PRIMARY KEY (google_custom_voice_sid)
 );

@@ -348,8 +359,7 @@ CREATE TABLE system_information
 domain_name VARCHAR(255),
 sip_domain_name VARCHAR(255),
 monitoring_domain_name VARCHAR(255),
-private_network_cidr VARCHAR(8192),
-log_level ENUM('info', 'debug') NOT NULL DEFAULT 'info'
+private_network_cidr VARCHAR(8192)
 );

 CREATE TABLE users
@@ -403,9 +413,6 @@ register_from_user VARCHAR(128),
 register_from_domain VARCHAR(255),
 register_public_ip_in_contact BOOLEAN NOT NULL DEFAULT false,
 register_status VARCHAR(4096),
-dtmf_type ENUM('rfc2833','tones','info') NOT NULL DEFAULT 'rfc2833',
-outbound_sip_proxy VARCHAR(255),
-trunk_type ENUM('static-ip','auth','registration') NOT NULL DEFAULT 'static-ip',
 PRIMARY KEY (voip_carrier_sid)
 ) COMMENT='A Carrier or customer PBX that can send or receive calls';

@@ -479,20 +486,6 @@ password VARCHAR(255),
 PRIMARY KEY (webhook_sid)
 ) COMMENT='An HTTP callback';

-CREATE TABLE clients
-(
-client_sid CHAR(36) NOT NULL UNIQUE ,
-account_sid CHAR(36) NOT NULL,
-is_active BOOLEAN NOT NULL DEFAULT 1,
-username VARCHAR(64),
-password VARCHAR(1024),
-allow_direct_app_calling BOOLEAN NOT NULL DEFAULT 1,
-allow_direct_queue_calling BOOLEAN NOT NULL DEFAULT 1,
-allow_direct_user_calling BOOLEAN NOT NULL DEFAULT 1,
-voip_carrier_sid CHAR(36),
-PRIMARY KEY (client_sid)
-);
-
 CREATE TABLE applications
 (
 application_sid CHAR(36) NOT NULL UNIQUE ,
@@ -518,7 +511,6 @@ fallback_speech_synthesis_label VARCHAR(64),
 fallback_speech_recognizer_vendor VARCHAR(64),
 fallback_speech_recognizer_language VARCHAR(64),
 fallback_speech_recognizer_label VARCHAR(64),
-env_vars TEXT,
 created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
 record_all_calls BOOLEAN NOT NULL DEFAULT false,
 PRIMARY KEY (application_sid)
@@ -561,7 +553,6 @@ siprec_hook_sid CHAR(36),
 record_all_calls BOOLEAN NOT NULL DEFAULT false,
 record_format VARCHAR(16) NOT NULL DEFAULT 'mp3',
 bucket_credential VARCHAR(8192) COMMENT 'credential used to authenticate with storage service',
-enable_debug_log BOOLEAN NOT NULL DEFAULT false,
 PRIMARY KEY (account_sid)
 ) COMMENT='An enterprise that uses the platform for comm services';

@@ -582,6 +573,9 @@ ALTER TABLE call_routes ADD FOREIGN KEY account_sid_idxfk_3 (account_sid) REFERE

 ALTER TABLE call_routes ADD FOREIGN KEY application_sid_idxfk (application_sid) REFERENCES applications (application_sid);

+CREATE INDEX client_sid_idx ON clients (client_sid);
+ALTER TABLE clients ADD CONSTRAINT account_sid_idxfk_13 FOREIGN KEY account_sid_idxfk_13 (account_sid) REFERENCES accounts (account_sid);
+
 CREATE INDEX dns_record_sid_idx ON dns_records (dns_record_sid);
 ALTER TABLE dns_records ADD FOREIGN KEY account_sid_idxfk_4 (account_sid) REFERENCES accounts (account_sid);

@@ -710,11 +704,6 @@ ALTER TABLE lcr_carrier_set_entry ADD FOREIGN KEY lcr_route_sid_idxfk (lcr_route
 ALTER TABLE lcr_carrier_set_entry ADD FOREIGN KEY voip_carrier_sid_idxfk_3 (voip_carrier_sid) REFERENCES voip_carriers (voip_carrier_sid);

 CREATE INDEX webhook_sid_idx ON webhooks (webhook_sid);
-CREATE INDEX client_sid_idx ON clients (client_sid);
-ALTER TABLE clients ADD CONSTRAINT account_sid_idxfk_13 FOREIGN KEY account_sid_idxfk_13 (account_sid) REFERENCES accounts (account_sid);
-
-ALTER TABLE clients ADD FOREIGN KEY voip_carrier_sid_idxfk_4 (voip_carrier_sid) REFERENCES voip_carriers (voip_carrier_sid);
-
 CREATE UNIQUE INDEX applications_idx_name ON applications (account_sid,name);

 CREATE INDEX application_sid_idx ON applications (application_sid);
@@ -748,4 +737,4 @@ ALTER TABLE accounts ADD FOREIGN KEY device_calling_application_sid_idxfk (devic

 ALTER TABLE accounts ADD FOREIGN KEY siprec_hook_sid_idxfk (siprec_hook_sid) REFERENCES applications (application_sid);

-SET FOREIGN_KEY_CHECKS=0;
+SET FOREIGN_KEY_CHECKS=1;
@@ -19,8 +19,7 @@ values ('f4e1848d-3ff8-40eb-b9c1-30e1ef053f94','ed649e33-e771-403a-8c99-1780eabb
 insert into account_products(account_product_sid, account_subscription_sid, product_sid,quantity)
 values ('f23ff996-6534-4aba-8666-4b347391eca2', 'f4e1848d-3ff8-40eb-b9c1-30e1ef053f94', 'c4403cdb-8e75-4b27-9726-7d8315e3216d', 10);

-insert into voip_carriers (voip_carrier_sid, name, account_sid, service_provider_sid) 
-values ('287c1452-620d-4195-9f19-c9814ef90d78', 'westco', 'ed649e33-e771-403a-8c99-1780eabbc803', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0');
+insert into voip_carriers (voip_carrier_sid, name, account_sid) values ('287c1452-620d-4195-9f19-c9814ef90d78', 'westco', 'ed649e33-e771-403a-8c99-1780eabbc803');
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
 values ('124a5339-c62c-4075-9e19-f4de70a96597', '287c1452-620d-4195-9f19-c9814ef90d78', '172.38.0.20', true, true);
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, port, inbound, outbound) 
@@ -43,8 +42,7 @@ insert into account_products(account_product_sid, account_subscription_sid, prod
 values ('92f137f7-4bc3-4157-b096-6817e54b1874', '73bbcc5d-512f-4cea-8535-9a6e3d2bd19d', 'c4403cdb-8e75-4b27-9726-7d8315e3216d', 0);
 insert into account_limits(account_limits_sid, account_sid, category, quantity) values('a1b2c3d4-e5f6-7a8b-9c0d-1e2f3a4b5c6d', 'd7cc37cb-d152-49ef-a51b-485f6e917089', 'voice_call_session', 0);

-insert into voip_carriers (voip_carrier_sid, name, account_sid, service_provider_sid) 
-values ('9b1abdc7-0220-4964-bc66-32b5c70cd9ab', 'westco', 'd7cc37cb-d152-49ef-a51b-485f6e917089', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0');
+insert into voip_carriers (voip_carrier_sid, name, account_sid) values ('9b1abdc7-0220-4964-bc66-32b5c70cd9ab', 'westco', 'd7cc37cb-d152-49ef-a51b-485f6e917089');
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
 values ('12f401d9-cbb1-49e5-bd33-cefbca0badc3', '9b1abdc7-0220-4964-bc66-32b5c70cd9ab', '172.38.0.20', true, true);
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, port, inbound, outbound) 
@@ -54,8 +52,7 @@ values ('1401eb72-0daf-4471-aba6-038a0a2587b3', '9b1abdc7-0220-4964-bc66-32b5c70
 insert into applications (application_sid, name, account_sid, call_hook_sid, call_status_hook_sid)
 values ('3b43e39f-4346-4218-8434-a53130e8be49', 'test', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', '90dda62e-0ea2-47d1-8164-5bd49003476c', '4d7ce0aa-5ead-4e61-9a6b-3daa732218b1');

-insert into voip_carriers (voip_carrier_sid, name, account_sid, application_sid, service_provider_sid) 
-values ('999c1452-620d-4195-9f19-c9814ef90d78', 'customer PBX', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', '3b43e39f-4346-4218-8434-a53130e8be49', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0');
+insert into voip_carriers (voip_carrier_sid, name, account_sid, application_sid) values ('999c1452-620d-4195-9f19-c9814ef90d78', 'customer PBX', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', '3b43e39f-4346-4218-8434-a53130e8be49');
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
 values ('888a5339-c62c-4075-9e19-f4de70a96597', '999c1452-620d-4195-9f19-c9814ef90d78', '172.38.0.21', true, false);
 
@@ -72,9 +69,6 @@ values ('d458bf7a-bcea-47b2-ac96-66dfc9c5c220', '150822233*', '287c1452-620d-419
 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');

-insert into phone_numbers (phone_number_sid, number, voip_carrier_sid, account_sid, application_sid)
-values ('c17d5a7d-9328-4663-92c0-f65aa8381264', '12125551212', '287c1452-620d-4195-9f19-c9814ef90d78', 'ed649e33-e771-403a-8c99-1780eabbc803', '3b43e39f-4346-4218-8434-a53130e8be49');
-
 -- 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');
@@ -95,48 +89,3 @@ insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outb
 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);
-
-- voip carrier belonging to all accounts
-insert into voip_carriers (voip_carrier_sid, name, service_provider_sid) 
-values ('voip100', 'test-voip-carrier', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0');
-insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
-values ('sip100', 'voip100', '172.38.0.50', true, false);
-
-insert into voip_carriers (voip_carrier_sid, name, service_provider_sid) 
-values ('voip101', 'test-voip-carrier-101', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0');
-insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
-values ('sip101', 'voip101', '172.38.0.50', true, false);
-insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
-values ('sip102', 'voip101', '172.38.0.51', true, false);
-
-insert into applications (application_sid, name, account_sid, call_hook_sid, call_status_hook_sid)
-values ('app100', 'app100', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', '90dda62e-0ea2-47d1-8164-5bd49003476c', '90dda62e-0ea2-47d1-8164-5bd49003476c');
-insert into applications (application_sid, name, account_sid, call_hook_sid, call_status_hook_sid)
-values ('app101', 'app101', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', '90dda62e-0ea2-47d1-8164-5bd49003476c', '90dda62e-0ea2-47d1-8164-5bd49003476c');
-insert into phone_numbers (phone_number_sid, number, voip_carrier_sid, account_sid, application_sid)
-values ('phone100', '^100', 'voip101', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', 'app100');
-insert into phone_numbers (phone_number_sid, number, voip_carrier_sid, account_sid, application_sid)
-values ('phone101', '^10012', 'voip100', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', 'app101');
-- insert an invalid regex pattern, the below pattern should be ignored during pattern
-insert into phone_numbers (phone_number_sid, number, voip_carrier_sid, account_sid, application_sid)
-values ('phone102', '\\dkjfhmdf\\', 'voip100', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', 'app101');
-
-- account with a sip realm that is not associated with any voip carriers
-insert into accounts (account_sid, name, service_provider_sid, webhook_secret, sip_realm)
-values ('acct-100', 'Account 100', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', 'foobar', 'ram.sip.jambonz.org');
-
-- registration trunk carrier for ephemeral gateway testing
-insert into voip_carriers (voip_carrier_sid, name, account_sid, service_provider_sid, trunk_type,
-    requires_register, register_username, register_sip_realm, register_password, is_active)
-values ('4a7d1c8e-5f2b-4d9a-8e3c-6b5a9f1e4c7d', 'test-registration-trunk', 'ed649e33-e771-403a-8c99-1780eabbc803',
-    '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', 'registration', true, 'testuser',
-    'sip.carrier.example.com', 'testpass', true);
-
-- sip_gateway for outbound only (inbound will use ephemeral gateway from Redis)
-insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound)
-values ('8b3e5f9a-2c1d-4e7b-9a6c-3d8f1e5a7b2c', '4a7d1c8e-5f2b-4d9a-8e3c-6b5a9f1e4c7d', '3.3.3.3', false, true);
-
-- phone number for ephemeral gateway test
-insert into phone_numbers (phone_number_sid, number, voip_carrier_sid, account_sid, application_sid)
-values ('7c2d4e6f-8a1b-4c9d-7e5f-2a8b3c6d9e1f', '16175551000', '4a7d1c8e-5f2b-4d9a-8e3c-6b5a9f1e4c7d', 'ed649e33-e771-403a-8c99-1780eabbc803',
-    '3b43e39f-4346-4218-8434-a53130e8be49');
@@ -23,7 +23,7 @@ services:
      sbc-inbound:
        ipv4_address: 172.38.0.2
  sbc:
-    image: drachtio/drachtio-server:0.8.26
+    image: drachtio/drachtio-server:latest
    command: drachtio --contact "sip:*;transport=udp" --loglevel debug --sofia-loglevel 9
    ports:
      - "9060:9022/tcp"
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-<scenario name="UAC with x-application-sid header">
-  <send retrans="500">
-    <![CDATA[
-
-      INVITE sip:+12125551212@jambonz.org 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:12125551212@jambonz.org>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:sipp@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: uac-pcap-carrier-success
-      Content-Type: application/sdp
-      Content-Length: [len]
-      X-Application-Sid: 3b43e39f-4346-4218-8434-a53130e8be49
-
-      v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-      s=-
-      c=IN IP[media_ip_type] [media_ip]
-      t=0 0
-      m=audio [media_port] RTP/AVP 0
-      a=rtpmap:0 PCMU/8000
-]]>
-  </send>
-
-  <recv response="100" optional="true">
-  </recv>
-                
-  <recv response="482" rtd="true" >
-  </recv>
-
-</scenario>
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<!-- This program is free software; you can redistribute it and/or      -->
-<!-- modify it under the terms of the GNU General Public License as     -->
-<!-- published by the Free Software Foundation; either version 2 of the -->
-<!-- License, or (at your option) any later version.                    -->
-<!--                                                                    -->
-<!-- This program is distributed in the hope that it will be useful,    -->
-<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
-<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
-<!-- GNU General Public License for more details.                       -->
-<!--                                                                    -->
-<!-- You should have received a copy of the GNU General Public License  -->
-<!-- along with this program; if not, write to the                      -->
-<!-- Free Software Foundation, Inc.,                                    -->
-<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
-<!--                                                                    -->
-<!--                 Sipp 'uac' scenario with pcap (rtp) play           -->
-<!--                                                                    -->
-
-<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:100678@172.38.0.10:5060 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:100678@172.38.0.10:5060>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:sipp@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: uac-pcap-carrier-success
-      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>
-
-  <recv response="180" 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="200" 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:100678@172.38.0.10:5060 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:100678@172.38.0.10:5060>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Max-Forwards: 70
-      Subject: uac-pcap-carrier-success
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <!-- Play a pre-recorded PCAP file (RTP stream)                       -->
-  <nop>
-    <action>
-      <exec play_pcap_audio="pcap/g711a.pcap"/>
-    </action>
-  </nop>
-
-  <!-- Pause briefly      -->
-  <pause milliseconds="3000"/>
-
-  <!-- The 'crlf' option inserts a blank line in the statistics report. -->
-  <send retrans="500">
-    <![CDATA[
-
-      BYE sip:100678@172.38.0.10:5060 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:100678@172.38.0.10:5060>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 2 BYE
-      Subject: uac-pcap-carrier-success
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv response="200" crlf="true">
-  </recv>
-
-  <!-- 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>
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<!-- This program is free software; you can redistribute it and/or      -->
-<!-- modify it under the terms of the GNU General Public License as     -->
-<!-- published by the Free Software Foundation; either version 2 of the -->
-<!-- License, or (at your option) any later version.                    -->
-<!--                                                                    -->
-<!-- This program is distributed in the hope that it will be useful,    -->
-<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
-<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
-<!-- GNU General Public License for more details.                       -->
-<!--                                                                    -->
-<!-- You should have received a copy of the GNU General Public License  -->
-<!-- along with this program; if not, write to the                      -->
-<!-- Free Software Foundation, Inc.,                                    -->
-<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
-<!--                                                                    -->
-<!--                 Sipp 'uac' scenario with pcap (rtp) play           -->
-<!--                                                                    -->
-
-<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:+100678@ram.sip.jambonz.org 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:100678@ram.sip.jambonz.org>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:sipp@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: uac-pcap-carrier-success
-      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>
-
-  <recv response="180" 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="200" 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:100678@ram.sip.jambonz.org 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:100678@ram.sip.jambonz.org>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Max-Forwards: 70
-      Subject: uac-pcap-carrier-success
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <!-- Play a pre-recorded PCAP file (RTP stream)                       -->
-  <nop>
-    <action>
-      <exec play_pcap_audio="pcap/g711a.pcap"/>
-    </action>
-  </nop>
-
-  <!-- Pause briefly      -->
-  <pause milliseconds="3000"/>
-
-  <!-- The 'crlf' option inserts a blank line in the statistics report. -->
-  <send retrans="500">
-    <![CDATA[
-
-      BYE sip:100678@ram.sip.jambonz.org 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:100678@ram.sip.jambonz.org>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 2 BYE
-      Subject: uac-pcap-carrier-success
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv response="200" crlf="true">
-  </recv>
-
-  <!-- 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>
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<!-- This program is free software; you can redistribute it and/or      -->
-<!-- modify it under the terms of the GNU General Public License as     -->
-<!-- published by the Free Software Foundation; either version 2 of the -->
-<!-- License, or (at your option) any later version.                    -->
-<!--                                                                    -->
-<!-- This program is distributed in the hope that it will be useful,    -->
-<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
-<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
-<!-- GNU General Public License for more details.                       -->
-<!--                                                                    -->
-<!-- You should have received a copy of the GNU General Public License  -->
-<!-- along with this program; if not, write to the                      -->
-<!-- Free Software Foundation, Inc.,                                    -->
-<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
-<!--                                                                    -->
-<!--                 Sipp 'uac' scenario with pcap (rtp) play           -->
-<!--                                                                    -->
-
-<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:+16173333456@jambonz.org 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:16173333456@jambonz.org>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:sipp@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: uac-late-media
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv response="100" optional="true">
-  </recv>
-
-  <recv response="180" 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="200" 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:16173333456@jambonz.org 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:16173333456@jambonz.org>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Max-Forwards: 70
-      Subject: uac-late-media
-      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>
-
-  <!-- Play a pre-recorded PCAP file (RTP stream)                       -->
-  <nop>
-    <action>
-      <exec play_pcap_audio="pcap/g711a.pcap"/>
-    </action>
-  </nop>
-
-  <!-- Pause briefly      -->
-  <pause milliseconds="3000"/>
-
-  <!-- The 'crlf' option inserts a blank line in the statistics report. -->
-  <send retrans="500">
-    <![CDATA[
-
-      BYE sip:16173333456@jambonz.org 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:16173333456@jambonz.org>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 2 BYE
-      Subject: uac-late-media
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv response="200" crlf="true">
-  </recv>
-
-  <!-- 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>
-
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<!-- This program is free software; you can redistribute it and/or      -->
-<!-- modify it under the terms of the GNU General Public License as     -->
-<!-- published by the Free Software Foundation; either version 2 of the -->
-<!-- License, or (at your option) any later version.                    -->
-<!--                                                                    -->
-<!-- This program is distributed in the hope that it will be useful,    -->
-<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
-<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
-<!-- GNU General Public License for more details.                       -->
-<!--                                                                    -->
-<!-- You should have received a copy of the GNU General Public License  -->
-<!-- along with this program; if not, write to the                      -->
-<!-- Free Software Foundation, Inc.,                                    -->
-<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
-<!--                                                                    -->
-<!--                 Sipp 'uac' scenario with pcap (rtp) play           -->
-<!--                                                                    -->
-
-<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:+16175551000@jambonz.org 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:16175551000@jambonz.org>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:sipp@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: uac-pcap-ephemeral-gateway-success
-      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>
-
-  <recv response="180" 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="200" 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:16175551000@jambonz.org 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:16175551000@jambonz.org>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Max-Forwards: 70
-      Subject: uac-pcap-ephemeral-gateway-success
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <!-- Play a pre-recorded PCAP file (RTP stream)                       -->
-  <nop>
-    <action>
-      <exec play_pcap_audio="pcap/g711a.pcap"/>
-    </action>
-  </nop>
-
-  <!-- Pause briefly      -->
-  <pause milliseconds="3000"/>
-
-  <!-- The 'crlf' option inserts a blank line in the statistics report. -->
-  <send retrans="500">
-    <![CDATA[
-
-      BYE sip:16175551000@jambonz.org 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:16175551000@jambonz.org>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 2 BYE
-      Subject: uac-pcap-ephemeral-gateway-success
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv response="200" crlf="true">
-  </recv>
-
-  <!-- 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>
-
@@ -33,22 +33,9 @@ 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-late-media.xml', '172.38.0.20');
-    t.pass('incoming call with no SDP packet is rejected with a 488');
-
-    await sippUac('uac-did-applicationsid-loop.xml', '172.38.0.20');
-    t.pass('incoming call with x-application-sid header is rejected with 482');
-
    await sippUac('uac-pcap-carrier-success.xml', '172.38.0.20');
    t.pass('incoming call from carrier completed successfully');

-    // Test ephemeral gateway (registration trunk)
-    const { createEphemeralGateway } = srf.locals.realtimeDbHelpers;
-    await createEphemeralGateway('172.38.0.60', '4a7d1c8e-5f2b-4d9a-8e3c-6b5a9f1e4c7d', 3600);
-    await sippUac('uac-pcap-ephemeral-gateway-success.xml', '172.38.0.60');
-    t.pass('incoming call from ephemeral gateway (registration trunk) completed successfully');
-
    await sippUac('uac-pcap-pbx-success.xml', '172.38.0.21');
    t.pass('incoming call from account-level carrier completed successfully');
  
@@ -73,15 +60,6 @@ test('incoming call tests', async(t) => {
    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');

-    await sippUac('uac-did-regex-match-vc-all-accts.xml', '172.38.0.50');
-    t.pass('incoming call matched by trailing wildcard *, voice gateway belongs to all accounts, with sip realm');
-
-    await sippUac('uac-did-regex-match-vc-all-accts-nosiprealm.xml', '172.38.0.51');
-    t.pass('incoming call matched by trailing wildcard *, voice gateway belongs to all accounts, without sip realm');
-
-    await sippUac('uac-did-regex-match-vc-all-accts-nosiprealm.xml', '172.38.0.50');
-    t.pass('incoming call matched by trailing wildcard *, voice gateway belongs to all accounts, without sip realm');
-
    /* 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');
@@ -89,9 +67,8 @@ test('incoming call tests', async(t) => {
  
    await waitFor(12);
    const res = await queryCdrs({account_sid: 'ed649e33-e771-403a-8c99-1780eabbc803'});
-    console.log(`cdrs res.total: ${res.total}`);
    //console.log(`cdrs: ${JSON.stringify(res)}`);
-    t.ok(8 === res.total, 'successfully wrote 8 cdrs for calls (including ephemeral gateway)');
+    t.ok(7 === res.total, 'successfully wrote 7 cdrs for calls');

    srf.disconnect();
    t.end();
Author	SHA1	Message	Date
Dave Horton	ae8a906538	on REFER from fs, remove incoming Contact header before sending onward	2024-10-03 10:35:59 -04:00
Dave Horton	66c5d120fa	wip	2024-09-25 15:26:55 -04:00
Dave Horton	cef0be86c9	detect wss transport	2024-09-25 15:24:34 -04:00
Dave Horton	b9d789c1bf	fix for #163	2024-09-19 10:36:42 -04:00