Skip to content

support ipv6 messages #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ElenaShleifer wants to merge 2 commits into
base: master
Choose a base branch
from
Open

support ipv6 messages #143

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17f7fe5
support ipv6 messages
ElenaShleifer Jun 24, 2020
1088ef4
support tls port in Via header
ElenaShleifer Apr 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions sip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function parseAorWithUri(data) {
}

function parseVia(data) {
var r = applyRegex(/SIP\s*\/\s*(\d+\.\d+)\s*\/\s*([\S]+)\s+([^\s;:]+)(?:\s*:\s*(\d+))?/g, data);
var r = applyRegex(/SIP\s*\/\s*(\d+\.\d+)\s*\/\s*([\S]+)\s+([\w\-\.]+|\[[\w\-\:]+\])(?::(\d+))(?:\s*:\s*(\d+))?/g, data);
return parseParams(data, {version: r[1], protocol: r[2], host: r[3], port: r[4] && +r[4]});
}

Expand Down Expand Up @@ -211,17 +211,20 @@ function parseUri(s) {
if(typeof s === 'object')
return s;

var re = /^(sips?):(?:([^\s>:@]+)(?::([^\s@>]+))?@)?([\w\-\.]+)(?::(\d+))?((?:;[^\s=\?>;]+(?:=[^\s?\;]+)?)*)(?:\?(([^\s&=>]+=[^\s&=>]+)(&[^\s&=>]+=[^\s&=>]+)*))?$/;
var re = /^(sips?):(?:([^\s>:@]+)(?::([^\s@>]+))?@)([\w\-\.]+|\[[\w\-\:]+\])(?::(\d+))?((?:;[^\s=\?>;]+(?:=[^\s?\;]+)?)*)(?:\?(([^\s&=>]+=[^\s&=>]+)(&[^\s&=>]+=[^\s&=>]+)*))?$/;
Copy link
Owner

@kirm kirm Jul 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This won't match sip:somhost.net - which is valid sip uri.


var r = re.exec(s);

if(r) {
var hostString = r[4].replace('\[','');
hostString = hostString.replace('\]','');

return {
schema: r[1],
user: r[2],
password: r[3],
host: r[4],
port: +r[5],
host: hostString,
port: r[5],
params: (r[6].match(/([^;=]+)(=([^;=]+))?/g) || [])
.map(function(s) { return s.split('='); })
.reduce(function(params, x) { params[x[0]]=x[1] || null; return params;}, {}),
Expand Down Expand Up @@ -823,8 +826,15 @@ function makeTransport(options, callback) {
function wrap(obj, target) {
return Object.create(obj, {send: {value: function(m) {
if(m.method) {
m.headers.via[0].host = options.publicAddress || options.address || options.hostname || os.hostname();
m.headers.via[0].port = options.port || defaultPort(this.protocol);
var host = options.publicAddress || options.address || options.hostname || os.hostname();
var hostValue = net.isIPv6(host) ? "[" + host + "]" : host;
m.headers.via[0].host = hostValue;
let reqUri = parseUri(m.uri);
let tlsPort;
if(reqUri.params.transport && reqUri.params.transport === "tls"){
tlsPort = options.tls_port;
}
m.headers.via[0].port = tlsPort || options.port || defaultPort(this.protocol);
m.headers.via[0].protocol = this.protocol;

if(this.protocol === 'UDP' && (!options.hasOwnProperty('rport') || options.rport)) {
Expand Down