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
Client - Documentation for `enumitems` (commented out)
[tpg/opendispense2.git]
/
src
/
server
/
main.c
diff --git
a/src/server/main.c
b/src/server/main.c
index
83c8e06
..
18c02dc
100644
(file)
--- a/
src/server/main.c
+++ b/
src/server/main.c
@@
-25,6
+25,7
@@
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 int giServer_Port;
extern char *gsItemListFile;
extern char *gsCoke_SerialPort;
@@
-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()
@@
-67,7
+69,6
@@
void PrintUsage(const char *progname)
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
+86,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]);
@@
-116,12
+120,18
@@
int main(int argc, char *argv[])
}
fgets(buf, sizeof buf, fp);
fclose(fp);
}
fgets(buf, sizeof buf, fp);
fclose(fp);
- gsDoor_Password = strdup(buf);
;
+ gsDoor_Password = strdup(buf);
}
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]);
@@
-147,11
+157,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;
}
@@
-174,6
+182,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;
@@
-237,6
+250,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