git.ucc.asn.au
/
tpg
/
opendispense2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed door code to use direct serial instead of llogin
[tpg/opendispense2.git]
/
src
/
server
/
main.c
diff --git
a/src/server/main.c
b/src/server/main.c
index
eedafc3
..
d336b77
100644
(file)
--- a/
src/server/main.c
+++ b/
src/server/main.c
@@
-25,11
+25,12
@@
extern void Init_Handlers(void);
extern void Load_Itemlist(void);
extern void Server_Start(void);
extern void Init_Handlers(void);
extern void Load_Itemlist(void);
extern void Server_Start(void);
+extern int gbServer_RunInBackground;
extern int giServer_Port;
extern char *gsItemListFile;
extern char *gsCoke_SerialPort;
extern char *gsSnack_SerialPort;
extern int giServer_Port;
extern char *gsItemListFile;
extern char *gsCoke_SerialPort;
extern char *gsSnack_SerialPort;
-extern char *gsDoor_
Password
;
+extern char *gsDoor_
SerialPort
;
// === PROTOTYPES ===
void *Periodic_Thread(void *Unused);
// === PROTOTYPES ===
void *Periodic_Thread(void *Unused);
@@
-42,6
+43,7
@@
char *gsCokebankPath = "cokebank.db";
struct sPeriodicCall {
void (*Function)(void);
} gaPeriodicCalls[ciMaxPeriodics];
struct sPeriodicCall {
void (*Function)(void);
} gaPeriodicCalls[ciMaxPeriodics];
+pthread_t gTimerThread;
// === CODE ===
void sigint_handler()
// === CODE ===
void sigint_handler()
@@
-58,16
+60,17
@@
void PrintUsage(const char *progname)
fprintf(stderr, " Set debug level (0 - 2, default 0)\n");
fprintf(stderr, " --cokeport\n");
fprintf(stderr, " Coke machine serial port (Default \"/dev/ttyS0\")\n");
fprintf(stderr, " Set debug level (0 - 2, default 0)\n");
fprintf(stderr, " --cokeport\n");
fprintf(stderr, " Coke machine serial port (Default \"/dev/ttyS0\")\n");
- fprintf(stderr, " --doorp
ass
\n");
- fprintf(stderr, " Door
LAT password file (Default empty password
)\n");
+ fprintf(stderr, " --doorp
ort
\n");
+ fprintf(stderr, " Door
modem/relay serial port (Default \"/dev/ttyS3\"
)\n");
fprintf(stderr, " --cokebank\n");
fprintf(stderr, " Coke bank database file (Default \"cokebank.db\")\n");
fprintf(stderr, " --cokebank\n");
fprintf(stderr, " Coke bank database file (Default \"cokebank.db\")\n");
+ fprintf(stderr, " --[dont-]daemonise\n");
+ fprintf(stderr, " Run (or explicitly don't) the server disconnected from the terminal\n");
}
int main(int argc, char *argv[])
{
int i;
}
int main(int argc, char *argv[])
{
int i;
- pthread_t timer_thread;
// Parse Arguments
for( i = 1; i < argc; i++ )
// Parse Arguments
for( i = 1; i < argc; i++ )
@@
-85,6
+88,9
@@
int main(int argc, char *argv[])
if( i + 1 >= argc ) return -1;
giDebugLevel = atoi(argv[++i]);
break;
if( i + 1 >= argc ) return -1;
giDebugLevel = atoi(argv[++i]);
break;
+ case 'D':
+ gbServer_RunInBackground = 1;
+ return -1;
default:
// Usage Error?
PrintUsage(argv[0]);
default:
// Usage Error?
PrintUsage(argv[0]);
@@
-104,24
+110,20
@@
int main(int argc, char *argv[])
if( i + 1 >= argc ) return -1;
gsSnack_SerialPort = argv[++i];
}
if( i + 1 >= argc ) return -1;
gsSnack_SerialPort = argv[++i];
}
- else if( strcmp(arg, "--doorpass") == 0 ) {
- FILE *fp;
- char buf[30];
+ else if( strcmp(arg, "--doorport") == 0 ) {
if( i + 1 >= argc ) return -1;
if( i + 1 >= argc ) return -1;
- fp = fopen(argv[++i], "r");
- if( !fp ) {
- fprintf(stderr, "ERROR: Unable to read password file\n");
- perror("reading LAT password");
- return -1;
- }
- fgets(buf, sizeof buf, fp);
- fclose(fp);
- gsDoor_Password = strdup(buf);;
+ gsDoor_SerialPort = argv[++i];
}
else if( strcmp(arg, "--cokebank") == 0 ) {
if( i + 1 >= argc ) return -1;
gsCokebankPath = argv[++i];
}
}
else if( strcmp(arg, "--cokebank") == 0 ) {
if( i + 1 >= argc ) return -1;
gsCokebankPath = argv[++i];
}
+ else if( strcmp(arg, "--daemonise") == 0 ) {
+ gbServer_RunInBackground = 1;
+ }
+ else if( strcmp(arg, "--dont-daemonise") == 0 ) {
+ gbServer_RunInBackground = 0;
+ }
else {
// Usage error?
PrintUsage(argv[0]);
else {
// Usage error?
PrintUsage(argv[0]);
@@
-136,6
+138,7
@@
int main(int argc, char *argv[])
}
signal(SIGINT, sigint_handler);
}
signal(SIGINT, sigint_handler);
+ signal(SIGTERM, sigint_handler);
openlog("odispense2", 0, LOG_LOCAL4);
openlog("odispense2", 0, LOG_LOCAL4);
@@
-146,11
+149,9
@@
int main(int argc, char *argv[])
Load_Itemlist();
Load_Itemlist();
- pthread_create( &timer_thread, NULL, Periodic_Thread, NULL );
-
Server_Start();
Server_Start();
- pthread_kill(
timer_t
hread, SIGKILL);
+ pthread_kill(
gTimerT
hread, SIGKILL);
return 0;
}
return 0;
}
@@
-173,6
+174,11
@@
void *Periodic_Thread(void *Unused)
return NULL;
}
return NULL;
}
+void StartPeriodicThread(void)
+{
+ pthread_create( &gTimerThread, NULL, Periodic_Thread, NULL );
+}
+
void AddPeriodicFunction(void (*Fcn)(void))
{
int i;
void AddPeriodicFunction(void (*Fcn)(void))
{
int i;
@@
-236,6
+242,8
@@
int InitSerial(const char *File, int BaudRate)
info.c_lflag = 0; // Non-Canoical, No Echo
info.c_cflag = baud | CS8 | CLOCAL | CREAD; // baud, 8N1
info.c_lflag = 0; // Non-Canoical, No Echo
info.c_cflag = baud | CS8 | CLOCAL | CREAD; // baud, 8N1
+ info.c_iflag = IGNCR; // Ignore \r
+ info.c_oflag = 0; // ???
cfsetspeed(&info, baud);
info.c_cc[VTIME] = 0; // No time limit
info.c_cc[VMIN] = 1; // Block until 1 char
cfsetspeed(&info, baud);
info.c_cc[VTIME] = 0; // No time limit
info.c_cc[VMIN] = 1; // Block until 1 char
UCC
git Repository :: git.ucc.asn.au