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

Remove proxy port configuration #308

Merged
merged 2 commits into from
Jun 25, 2024
Merged

Remove proxy port configuration #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f8a0e5
Remove proxy port configuration
Amygos Mar 14, 2024
ae04280
Merge branch 'ns8' into remove_flexisip
Stell0 Jun 24, 2024
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
5 changes: 0 additions & 5 deletions root/usr/lib/node/nethcti-server/plugins/com_user_rest/plugins_rest/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,11 +683,6 @@ function setCompUtil(comp) {
if (result.endpoints[compUser.ENDPOINT_TYPES.extension][i].id === defExt) {
defextObj = result.endpoints[compUser.ENDPOINT_TYPES.extension][i];
}
if (result.endpoints[compUser.ENDPOINT_TYPES.extension][i].type === 'mobile') {
result.endpoints[compUser.ENDPOINT_TYPES.extension][i].proxy_port = compConfigManager.getProxyPort();
} else {
result.endpoints[compUser.ENDPOINT_TYPES.extension][i].proxy_port = null;
}
}
for (i = 0; i < result.endpoints[compUser.ENDPOINT_TYPES.mainextension].length; i++) {
if (result.endpoints[compUser.ENDPOINT_TYPES.mainextension][i].id === defExt) {
Expand Down
33 changes: 1 addition & 32 deletions root/usr/lib/node/nethcti-server/plugins/config_manager/config_manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,16 +146,6 @@ var compComNethctiWs;
*/
var serverHostname = '';

/**
* The SIP proxy port number. It will be customized by the _config_ method.
*
* @property proxyPort
* @type integer
* @private
* @default ""
*/
var proxyPort;

/**
* The server chat parameters. It can be customized using the JSON
* configuration file by means _configChat_ method.
Expand Down Expand Up @@ -546,7 +536,7 @@ function configChat(path) {
}

/**
* It reads the JSON configuration file and set the server ip address and proxy port.
* It reads the JSON configuration file and set the server ip address.
*
* @method config
* @param {string} path The path of the configuration file
Expand Down Expand Up @@ -575,11 +565,6 @@ function config(path) {
}
serverHostname = json.hostname;

// set proxy port
if (typeof json.proxy_port == "number") {
proxyPort = json.proxy_port;
}

logger.log.info(IDLOG, 'configuration done by ' + CONFIG_FILEPATH);

} catch (err) {
Expand Down Expand Up @@ -896,21 +881,6 @@ function getServerHostname() {
}
}

/**
* Returns the SIP proxy port.
*
* @method getProxyPort
* @return {integer} The SIP proxy port.
*/
function getProxyPort() {
try {
return proxyPort;
} catch (err) {
logger.log.error(IDLOG, err.stack);
}
}


/**
* It reads the JSON configuration file of phone urls used to
* directly interact with the phones, e.g. to originate a new call.
Expand Down Expand Up @@ -2006,7 +1976,6 @@ exports.setCompAstProxy = setCompAstProxy;
exports.setCompAuthorization = setCompAuthorization;
exports.configPhoneUrls = configPhoneUrls;
exports.getServerHostname = getServerHostname;
exports.getProxyPort = getProxyPort
exports.getDtmfUrlFromAgent = getDtmfUrlFromAgent;
exports.setCompComNethctiWs = setCompComNethctiWs;
exports.getCallUrlFromAgent = getCallUrlFromAgent;
Expand Down
Loading