Skip to content
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

Update dynamic uri and contact_uri #513

Merged
merged 1 commit into from
Feb 3, 2025
Merged

Update dynamic uri and contact_uri #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions lib/src/config.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ class Settings {

// SIP account.
String? display_name;
dynamic uri;
dynamic contact_uri;
URI? uri;
URI? contact_uri;
String user_agent = DartSIP_C.USER_AGENT;

// SIP instance id (GRUU).
Expand Down
2 changes: 1 addition & 1 deletion lib/src/rtc_session/refer_subscriber.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class ReferSubscriber extends EventManager {

// Referred-By header field.
String referredBy =
'Referred-By: <${_session.ua.configuration.uri.scheme}:${_session.ua.configuration.uri.user}@${_session.ua.configuration.uri.host}>';
'Referred-By: <${_session.ua.configuration.uri!.scheme}:${_session.ua.configuration.uri!.user}@${_session.ua.configuration.uri!.host}>';

extraHeaders.add(referredBy);
extraHeaders.add('Contact: ${_session.contact}');
Expand Down
6 changes: 4 additions & 2 deletions lib/src/sip_ua_helper.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ class SIPUAHelper extends EventManager {
}

_settings.transportType = uaSettings.transportType!;
_settings.uri = uaSettings.uri;
_settings.uri = uaSettings.uri != null ? URI.parse(uaSettings.uri!) : null;
_settings.sip_message_delay = uaSettings.sip_message_delay;
_settings.realm = uaSettings.realm;
_settings.password = uaSettings.password;
Expand All @@ -179,7 +179,9 @@ class SIPUAHelper extends EventManager {
uaSettings.sessionTimersRefreshMethod;
_settings.instance_id = uaSettings.instanceId;
_settings.registrar_server = uaSettings.registrarServer;
_settings.contact_uri = uaSettings.contact_uri;
_settings.contact_uri = uaSettings.contact_uri != null
? URI.parse(uaSettings.contact_uri!)
: null;
_settings.connection_recovery_max_interval =
uaSettings.connectionRecoveryMaxInterval;
_settings.connection_recovery_min_interval =
Expand Down
10 changes: 5 additions & 5 deletions lib/src/ua.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ class UA extends EventManager {
DartSIP_C.SipMethod? method = request.method;

// Check that request URI points to us.
if (request.ruri!.user != _configuration.uri.user &&
if (request.ruri!.user != _configuration.uri!.user &&
request.ruri!.user != _contact!.uri!.user) {
logger.d('Request-URI does not point to us');
if (request.method != SipMethod.ACK) {
Expand Down Expand Up @@ -829,7 +829,7 @@ class UA extends EventManager {
_configuration.jssip_id = Utils.createRandomToken(5);

// String containing _configuration.uri without scheme and user.
URI hostport_params = _configuration.uri.clone();
URI hostport_params = _configuration.uri!.clone();

_configuration.terminateOnAudioMediaPortZero =
configuration.terminateOnAudioMediaPortZero;
Expand Down Expand Up @@ -864,12 +864,12 @@ class UA extends EventManager {

// Check whether authorization_user is explicitly defined.
// Take '_configuration.uri.user' value if not.
_configuration.authorization_user ??= _configuration.uri.user;
_configuration.authorization_user ??= _configuration.uri!.user;

// If no 'registrar_server' is set use the 'uri' value without user portion and
// without URI params/headers.
if (_configuration.registrar_server == null) {
URI registrar_server = _configuration.uri.clone();
URI registrar_server = _configuration.uri!.clone();
registrar_server.user = null;
registrar_server.clearParams();
registrar_server.clearHeaders();
Expand All @@ -889,7 +889,7 @@ class UA extends EventManager {

// Via Host.
if (_configuration.contact_uri != null) {
_configuration.via_host = _configuration.contact_uri.host;
_configuration.via_host = _configuration.contact_uri!.host;
}
// Contact URI.
else {
Expand Down