| summaryrefslogtreecommitdiff |
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-04-28 15:15:08 +0200 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-04-28 15:15:08 +0200 |
| commit | 333091f78934d55b7b6458c575d8f23f364636c8 (patch) | |
| tree | 8db1d59ff9aec1f61d5ac9c5ad3e750dc78e7a08 /src | |
| parent | 1d32728b9712702c9bca90d6dac370ff5fe2c214 (diff) | |
Fixes ?RLR eating first char; !P and !N messages.
Diffstat (limited to 'src')
| -rw-r--r-- | src/error/error.h | 4 | ||||
| -rw-r--r-- | src/main.c | 6 | ||||
| -rw-r--r-- | src/server/server_create_socket.c | 9 | ||||
| -rw-r--r-- | src/server/server_worker_handle_request.c | 4 | ||||
| -rw-r--r-- | src/server/server_worker_send.c | 4 |
5 files changed, 16 insertions, 11 deletions
diff --git a/src/error/error.h b/src/error/error.h index 145c838..1d26faf 100644 --- a/src/error/error.h +++ b/src/error/error.h @@ -37,7 +37,7 @@ #endif #define JH_PRINT_STDERR(io, symbol, str, ...)\ - fprintf(io, "[" symbol "]" JH_LOCATION " " str "\n", __VA_ARGS__); + fprintf(io, "!AI [" symbol "]" JH_LOCATION " " str "\n", __VA_ARGS__); /* * Given that we use preprocessor contants as flags, we can expect the compilers @@ -94,7 +94,7 @@ /* For outputs without dynamic content (static). ******************************/ #define JH_PRINT_S_STDERR(io, symbol, str)\ - fprintf(io, "[" symbol "]" JH_LOCATION " " str "\n"); + fprintf(io, "!AI [" symbol "]" JH_LOCATION " " str "\n"); #define JH_S_DEBUG(io, flag, str)\ JH_ISOLATE\ @@ -16,10 +16,10 @@ static void print_help (const char runnable [const restrict static 1]) "\nUsages:\n" " SERVER:\t%s SESSION_NAME MARKOV_ORDER\n" " CLEAN UP:\t%s -c SESSION_NAME\n" - " SHOW HELP:\tAnything else\n" + " SHOW HELP:\tAnything else.\n" "\nParameters:\n" - " SESSION_NAME: Valid UNIX socket.\n" - " MARKOV_ORDER: Positive integer, greater than 1.\n", + " SESSION_NAME:\tValid UNIX socket.\n" + " MARKOV_ORDER:\tPositive integer, greater than 1.\n", JH_SERVER_VERSION, JH_PROTOCOL_VERSION, runnable, diff --git a/src/server/server_create_socket.c b/src/server/server_create_socket.c index aa74a8d..5e0c00b 100644 --- a/src/server/server_create_socket.c +++ b/src/server/server_create_socket.c @@ -51,8 +51,12 @@ static int bind_socket addr.sun_family = AF_UNIX; - /* addr.sun_path == 108. Using 107 ensure null-termination. */ - strncpy(addr.sun_path, socket_name, 107); + strncpy + ( + (void *) addr.sun_path, + (const void *) socket_name, + (sizeof(addr.sun_path) - 1) + ); errno = old_errno; @@ -157,6 +161,7 @@ int JH_server_socket_open const char socket_name [const restrict static 1] ) { + printf("\"%s\"\n", socket_name); if (create_socket(&(server_socket->file_descriptor)) < 0) { return -1; diff --git a/src/server/server_worker_handle_request.c b/src/server/server_worker_handle_request.c index 03c7c43..256ed06 100644 --- a/src/server/server_worker_handle_request.c +++ b/src/server/server_worker_handle_request.c @@ -211,8 +211,8 @@ static int handle_rlr ( JH_sequence_from_undercase_string ( - (const JH_char *) (worker->buffer + 6), - (worker->buffer_length - 7), + (const JH_char *) (worker->buffer + 5), + (worker->buffer_length - 6), worker->params.knowledge, &(worker->sequence_buffer), &(worker->sequence_buffer_capacity), diff --git a/src/server/server_worker_send.c b/src/server/server_worker_send.c index 79c1709..c85e13e 100644 --- a/src/server/server_worker_send.c +++ b/src/server/server_worker_send.c @@ -80,7 +80,7 @@ int JH_server_worker_send_positive { int err; - err = fprintf(worker->socket_as_file, "!P\n"); + err = fprintf(worker->socket_as_file, "!P \n"); if (err == 0) { @@ -114,7 +114,7 @@ int JH_server_worker_send_negative { int err; - err = fprintf(worker->socket_as_file, "!N\n"); + err = fprintf(worker->socket_as_file, "!N \n"); if (err == 0) { |


