Skip to content
Snippets Groups Projects
Commit 4c33738e authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Optionally send a prompt to connected user 

Wait up to 10 seconds for a single-char reply to the prompt and if a non-control character was received, use the [TCP:x] (x is the character sent by the user) from the sexpots.ini for the Host and Port values to connect to.

An experimental feature for Nelgin.
parent 09a32c0d
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
Pipeline #2608 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
Showing
with 50 additions and 35 deletions
src/sexpots/sexpots.c
+ 50
− 35
View file @ 4c33738e
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
/* global vars */ /* global vars */
BOOL daemonize=FALSE; BOOL daemonize=FALSE;
char prompt[INI_MAX_VALUE_LEN+1];
char termtype[INI_MAX_VALUE_LEN+1] = NAME; char termtype[INI_MAX_VALUE_LEN+1] = NAME;
char termspeed[INI_MAX_VALUE_LEN+1] = "28800,28800"; /* "tx,rx", max length not defined */ char termspeed[INI_MAX_VALUE_LEN+1] = "28800,28800"; /* "tx,rx", max length not defined */
char revision[16]; char revision[16];
...@@ -1386,69 +1387,72 @@ char* iniGetExistingWord(str_list_t list, const char* section, const char* key ...@@ -1386,69 +1387,72 @@ char* iniGetExistingWord(str_list_t list, const char* section, const char* key
return p; return p;
} }
str_list_t ini = NULL;
void parse_ini_file(const char* ini_fname) void parse_ini_file(const char* ini_fname)
{ {
FILE* fp; FILE* fp;
char* section; char* section;
str_list_t list=NULL;
strListFree(&ini);
if((fp=fopen(ini_fname,"r"))!=NULL) { if((fp=fopen(ini_fname,"r"))!=NULL) {
lprintf(LOG_INFO,"Reading %s",ini_fname); lprintf(LOG_INFO,"Reading %s",ini_fname);
list=iniReadFile(fp); ini = iniReadFile(fp);
fclose(fp); fclose(fp);
} }
/* Root section */ /* Root section */
pause_on_exit = iniGetBool(list,ROOT_SECTION,"PauseOnExit",FALSE); pause_on_exit = iniGetBool(ini,ROOT_SECTION,"PauseOnExit",FALSE);
log_level = iniGetLogLevel(list,ROOT_SECTION,"LogLevel",log_level); log_level = iniGetLogLevel(ini,ROOT_SECTION,"LogLevel",log_level);
iniGetString(ini, ROOT_SECTION, "Prompt", NULL, prompt);
if(iniGetBool(list,ROOT_SECTION,"Debug",FALSE)) if(iniGetBool(ini,ROOT_SECTION,"Debug",FALSE))
log_level=LOG_DEBUG; log_level=LOG_DEBUG;
/* [COM] Section */ /* [COM] Section */
section="COM"; section="COM";
iniGetExistingWord(list, section, "Device", NULL, com_dev); iniGetExistingWord(ini, section, "Device", NULL, com_dev);
com_baudrate = iniGetLongInt(list, section, "BaudRate", com_baudrate); com_baudrate = iniGetLongInt(ini, section, "BaudRate", com_baudrate);
com_hangup = iniGetBool(list, section, "Hangup", com_hangup); com_hangup = iniGetBool(ini, section, "Hangup", com_hangup);
hangup_attempts = iniGetInteger(list, section, "HangupAttempts", hangup_attempts); hangup_attempts = iniGetInteger(ini, section, "HangupAttempts", hangup_attempts);
dcd_timeout = iniGetInteger(list, section, "DCDTimeout", dcd_timeout); dcd_timeout = iniGetInteger(ini, section, "DCDTimeout", dcd_timeout);
dcd_ignore = iniGetBool(list, section, "IgnoreDCD", dcd_ignore); dcd_ignore = iniGetBool(ini, section, "IgnoreDCD", dcd_ignore);
dtr_delay = iniGetLongInt(list, section, "DTRDelay", dtr_delay); dtr_delay = iniGetLongInt(ini, section, "DTRDelay", dtr_delay);
mdm_null = iniGetBool(list, section, "NullModem", mdm_null); mdm_null = iniGetBool(ini, section, "NullModem", mdm_null);
/* [Modem] Section */ /* [Modem] Section */
section="Modem"; section="Modem";
iniGetExistingWord(list, section, "Init", "", mdm_init); iniGetExistingWord(ini, section, "Init", "", mdm_init);
iniGetExistingWord(list, section, "AutoAnswer", "", mdm_autoans); iniGetExistingWord(ini, section, "AutoAnswer", "", mdm_autoans);
iniGetExistingWord(list, section, "Cleanup", "", mdm_cleanup); iniGetExistingWord(ini, section, "Cleanup", "", mdm_cleanup);
iniGetExistingWord(list, section, "EnableCallerID", "", mdm_cid); iniGetExistingWord(ini, section, "EnableCallerID", "", mdm_cid);
iniGetExistingWord(list, section, "Answer", "", mdm_answer); iniGetExistingWord(ini, section, "Answer", "", mdm_answer);
iniGetExistingWord(list, section, "Ring", "", mdm_ring); iniGetExistingWord(ini, section, "Ring", "", mdm_ring);
mdm_timeout = iniGetInteger(list, section, "Timeout", mdm_timeout); mdm_timeout = iniGetInteger(ini, section, "Timeout", mdm_timeout);
mdm_reinit = iniGetInteger(list, section, "ReInit", mdm_reinit); mdm_reinit = iniGetInteger(ini, section, "ReInit", mdm_reinit);
mdm_cmdretry = iniGetInteger(list, section, "CmdRetry", mdm_cmdretry); mdm_cmdretry = iniGetInteger(ini, section, "CmdRetry", mdm_cmdretry);
mdm_manswer = iniGetBool(list,section,"ManualAnswer", mdm_manswer); mdm_manswer = iniGetBool(ini,section,"ManualAnswer", mdm_manswer);
/* [TCP] Section */ /* [TCP] Section */
section="TCP"; section="TCP";
iniGetExistingWord(list, section, "Host", NULL, host); iniGetExistingWord(ini, section, "Host", NULL, host);
port = iniGetShortInt(list, section, "Port", port); port = iniGetShortInt(ini, section, "Port", port);
tcp_nodelay = iniGetBool(list,section,"NODELAY", tcp_nodelay); tcp_nodelay = iniGetBool(ini,section,"NODELAY", tcp_nodelay);
/* [Telnet] Section */ /* [Telnet] Section */
section="Telnet"; section="Telnet";
telnet = iniGetBool(list,section,"Enabled", telnet); telnet = iniGetBool(ini,section,"Enabled", telnet);
debug_telnet = iniGetBool(list,section,"Debug", debug_telnet); debug_telnet = iniGetBool(ini,section,"Debug", debug_telnet);
telnet_advertise_cid = iniGetBool(list,section,"AdvertiseLocation", telnet_advertise_cid); telnet_advertise_cid = iniGetBool(ini,section,"AdvertiseLocation", telnet_advertise_cid);
iniGetExistingWord(list, section, "TermType", NULL, termtype); iniGetExistingWord(ini, section, "TermType", NULL, termtype);
iniGetExistingWord(list, section, "TermSpeed", NULL, termspeed); iniGetExistingWord(ini, section, "TermSpeed", NULL, termspeed);
/* [Ident] Section */ /* [Ident] Section */
section="Ident"; section="Ident";
ident = iniGetBool(list,section,"Enabled", ident); ident = iniGetBool(ini,section,"Enabled", ident);
ident_port = iniGetShortInt(list, section, "Port", ident_port); ident_port = iniGetShortInt(ini, section, "Port", ident_port);
ident_interface = iniGetIpAddress(list, section, "Interface", ident_interface); ident_interface = iniGetIpAddress(ini, section, "Interface", ident_interface);
iniGetExistingWord(list, section, "Response", NULL, ident_response); iniGetExistingWord(ini, section, "Response", NULL, ident_response);
} }
...@@ -1593,6 +1597,17 @@ service_loop(int argc, char** argv) ...@@ -1593,6 +1597,17 @@ service_loop(int argc, char** argv)
comWriteByte(com_handle,'\r'); comWriteByte(com_handle,'\r');
comWriteString(com_handle, banner); comWriteString(com_handle, banner);
comWriteString(com_handle, "\r\n"); comWriteString(com_handle, "\r\n");
if(prompt[0] != '\0') {
comWriteString(com_handle, prompt);
char ch;
if(comReadBuf(com_handle, &ch, sizeof(ch), NULL, 10000)) {
if(!IS_CONTROL(ch)) {
SAFEPRINTF(str, "TCP:%c", ch);
iniGetExistingWord(ini, str, "Host", NULL, host);
port = iniGetShortInt(ini, str, "Port", port);
}
}
}
if((sock=connect_socket(host, port)) == INVALID_SOCKET) { if((sock=connect_socket(host, port)) == INVALID_SOCKET) {
comWriteString(com_handle,"\7\r\n!ERROR connecting to TCP port\r\n"); comWriteString(com_handle,"\7\r\n!ERROR connecting to TCP port\r\n");
} else { } else {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment