Skip to content

Prevent simultaneous UA starts #178

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

Merged
merged 1 commit into from
May 26, 2015
Merged

Prevent simultaneous UA starts #178

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
12 changes: 8 additions & 4 deletions src/UA.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ module.exports = function (SIP, environment) {
var UA,
C = {
// UA status codes
STATUS_INIT : 0,
STATUS_READY: 1,
STATUS_USER_CLOSED: 2,
STATUS_NOT_READY: 3,
STATUS_INIT: 0,
STATUS_STARTING: 1,
STATUS_READY: 2,
STATUS_USER_CLOSED: 3,
STATUS_NOT_READY: 4,

// UA error codes
CONFIGURATION_ERROR: 1,
Expand Down Expand Up @@ -362,11 +363,14 @@ UA.prototype.start = function() {
this.logger.log('user requested startup...');
if (this.status === C.STATUS_INIT) {
server = this.getNextWsServer();
this.status = C.STATUS_STARTING;
new SIP.Transport(this, server);
} else if(this.status === C.STATUS_USER_CLOSED) {
this.logger.log('resuming');
this.status = C.STATUS_READY;
this.transport.connect();
} else if (this.status === C.STATUS_STARTING) {
this.logger.log('UA is in STARTING status, not opening new connection');
} else if (this.status === C.STATUS_READY) {
this.logger.log('UA is in READY status, not resuming');
} else {
Expand Down
10 changes: 8 additions & 2 deletions test/spec/SpecUA.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,19 @@ describe('UA', function() {
expect(UA.status).toBe(SIP.UA.C.STATUS_READY);
});

it('logs if the status is set to starting', function() {
UA.status = SIP.UA.C.STATUS_STARTING;
UA.start();
expect(UA.logger.log).toHaveBeenCalled();
});

it('logs if the status is set to ready', function() {
UA.status = SIP.UA.C.STATUS_READY;
UA.start();
expect(UA.logger.log).toHaveBeenCalled();
});

it('logs an error if the status is not C.STATUS_INIT, C.STATUS_USER_CLOSED, C.STATUS_READY', function() {
it('logs an error if the status is not C.STATUS_INIT, C.STATUS_STARTING, C.STATUS_USER_CLOSED, C.STATUS_READY', function() {
UA.status = SIP.UA.C.STATUS_NOT_READY;
UA.start();
expect(UA.logger.error).toHaveBeenCalled();
Expand All @@ -183,7 +189,7 @@ describe('UA', function() {
});

it('logs a warning and returns this if the ua has already been closed', function () {
UA.status = 2;
UA.status = 3;

expect(UA.stop()).toBe(UA);
expect(UA.logger.warn).toHaveBeenCalledWith('UA already closed');
Expand Down