home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Send log messages through server out file. Includes major refactoring.
[plomrogue]
/
src
/
server
/
run.c
diff --git
a/src/server/run.c
b/src/server/run.c
index 4f93669066464c3bc5b6ea466437c98e9b5b9586..ba48d8ce3690392dacd39bcb4de5ee9bbd1888a7 100644
(file)
--- a/
src/server/run.c
+++ b/
src/server/run.c
@@
-71,9
+71,6
@@
static uint8_t thing_in_whitelist(uint8_t id, int16_t * whitelist);
*/
static void turn_over();
*/
static void turn_over();
-/* Append "answer" to server output file, with instant fflush(). */
-static void answer_query(char * answer);
-
/* Try to read "msg" as meta command, act accordingly; on success, free it. */
static uint8_t meta_commands(char * msg);
/* Try to read "msg" as meta command, act accordingly; on success, free it. */
static uint8_t meta_commands(char * msg);
@@
-293,14
+290,6
@@
static void turn_over()
-static void answer_query(char * answer)
-{
- try_fwrite(answer, strlen(answer), 1, world.file_out, __func__);
- fflush(world.file_out);
-}
-
-
-
static uint8_t meta_commands(char * msg)
{
if (!strcmp("QUIT", msg))
static uint8_t meta_commands(char * msg)
{
if (!strcmp("QUIT", msg))
@@
-311,13
+300,13
@@
static uint8_t meta_commands(char * msg)
if (!strcmp("PING", msg))
{
free(msg);
if (!strcmp("PING", msg))
{
free(msg);
-
answer_query
("PONG\n");
+
send_to_outfile
("PONG\n");
return 1;
}
if (!strcmp("STACK", msg))
{
free(msg);
return 1;
}
if (!strcmp("STACK", msg))
{
free(msg);
-
answer_query
("THINGS_BELOW_PLAYER START\n");
+
send_to_outfile
("THINGS_BELOW_PLAYER START\n");
struct Thing * player = get_player();
struct Thing * t;
for (t = world.things; t; t = t->next)
struct Thing * player = get_player();
struct Thing * t;
for (t = world.things; t; t = t->next)
@@
-326,11
+315,11
@@
static uint8_t meta_commands(char * msg)
&& t != player)
{
struct ThingType * tt = get_thing_type(t->type);
&& t != player)
{
struct ThingType * tt = get_thing_type(t->type);
-
answer_query
(tt->name);
-
answer_query
("\n");
+
send_to_outfile
(tt->name);
+
send_to_outfile
("\n");
}
}
}
}
-
answer_query
("THINGS_BELOW_PLAYER END\n");
+
send_to_outfile
("THINGS_BELOW_PLAYER END\n");
return 1;
}
return 0;
return 1;
}
return 0;
@@
-338,6
+327,14
@@
static uint8_t meta_commands(char * msg)
+extern void send_to_outfile(char * answer)
+{
+ try_fwrite(answer, strlen(answer), 1, world.file_out, __func__);
+ fflush(world.file_out);
+}
+
+
+
extern void record(char * msg, uint8_t force)
{
static FILE * file_tmp = NULL;
extern void record(char * msg, uint8_t force)
{
static FILE * file_tmp = NULL;