kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 17:38:59 +00:00
Code Issues Projects Releases Wiki Activity

add netmask detection for nat discovery work

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13549 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2009-06-02 16:55:10 +00:00
parent 552e4d851d
commit b82984fe97
19 changed files with 143 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/switch.c
View File

@@ -171,7 +171,7 @@ void WINAPI ServiceCtrlHandler(DWORD control)
/* the main service entry point */
void WINAPI service_main(DWORD numArgs, char **args)
{
switch_core_flag_t flags = SCF_USE_SQL;
switch_core_flag_t flags = SCF_USE_SQL | SCF_USE_AUTO_NAT;
const char *err = NULL; /* error value for return from freeswitch initialization */
/* we have to initialize the service-specific stuff */
memset(&status, 0, sizeof(SERVICE_STATUS));
@@ -274,7 +274,7 @@ int main(int argc, char *argv[])
int alt_dirs = 0;
int known_opt;
int high_prio = 0;
switch_core_flag_t flags = SCF_USE_SQL;
switch_core_flag_t flags = SCF_USE_SQL | SCF_USE_AUTO_NAT;
int ret = 0;
switch_status_t destroy_status;
switch_file_t *fd;
@@ -306,6 +306,7 @@ int main(int argc, char *argv[])
"\t-hp -- enable high priority settings\n"
"\t-vg -- run under valgrind\n"
"\t-nosql -- disable internal sql scoreboard\n"
"\t-nonat -- disable auto nat detection\n"
"\t-stop -- stop freeswitch\n"
"\t-nc -- do not output to a console and background\n"
"\t-c -- output to a console and stay in the foreground\n"
@@ -463,6 +464,11 @@ int main(int argc, char *argv[])
known_opt++;
}
if (argv[x] && !strcmp(argv[x], "-nonat")) {
flags &= ~SCF_USE_AUTO_NAT;
known_opt++;
}
if (argv[x] && !strcmp(argv[x], "-vg")) {
flags |= SCF_VG;
known_opt++;