adyxax/b98
Archived
1
0
Fork 0
Code Issues Activity

Rewrote a part of the C wrapper for clarity and bug fixing

Browse source
This commit is contained in:
Julien Dessaux 2016-08-17 19:32:19 +02:00
parent 21258ec3e6
commit 1b03e5bfb2
2 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/b98.c
View file

@ -6,6 +6,7 @@
#include <unistd.h> #include <unistd.h>
#include "b98.h" #include "b98.h"
#include "dbg.h"
#include "tls.h" #include "tls.h"
pid_t pid = 0; pid_t pid = 0;
@ -63,24 +64,24 @@ int bot_loop(int socket_fd)
FD_SET(socket_fd, &rfds); FD_SET(socket_fd, &rfds);
select(20, &rfds, NULL, NULL, &timeout); select(20, &rfds, NULL, NULL, &timeout);
if ( FD_ISSET(PARENT_READ, &rfds) ) { if ( FD_ISSET(PARENT_READ, &rfds) ) {
static char sbuf[512]; /* string buffer */ static char msg[512]; /* string buffer */
static int n = 0; /* nition in buffer */ static int pos = 0; /* position in buffer */
ssize_t len = n + read(PARENT_READ, sbuf + n, 512 - n); char sbuf[512];
while (n < len) { ssize_t len = read(PARENT_READ, sbuf, sizeof(sbuf));
if ((n > 0 && sbuf[n] == '\n' && sbuf[n - 1] == '\r') ) { /* If we got a full message */ for (int n = 0; n < len; n++) {
tls_send(sbuf, n); msg[pos] = sbuf[n];
sbuf[n - 1] = '\0';
printf(">>> %s\n", sbuf); if ((pos > 0 && msg[pos] == '\n' && msg[pos - 1] == '\r') ) { /* If we got a full message */
memmove(sbuf, sbuf + n + 1, len - n - 1); tls_send(msg, pos + 1);
len = len - n - 1;
if (len == 1) msg[pos - 1] = '\0';
len = 0; printf(">>> %s\n", msg);
n = 0; /* we reinitialise n for the next run */ pos = 0; /* we reinitialise n for the next run */
} else if (n == 512) { /* If we got a full buffer without finding a \r\n */ } else if (pos == sizeof(msg)) { /* If we got a full buffer without finding a \r\n */
fprintf(stderr, "We got a full buffer without finding a \r\n"); fprintf(stderr, "We got a full buffer without finding a \r\n");
return 2; return 2;
} else { /* Nothing to do otherwise but roll the next char */ } else { /* Nothing to do otherwise but roll the next char */
n++; pos++;
} }
} }
} else if ( FD_ISSET(socket_fd, &rfds) ) { } else if ( FD_ISSET(socket_fd, &rfds) ) {
@ -95,8 +96,8 @@ int bot_handle_input(const char* const sbuf, int len)
static int pos = 0; /* position in msg buffer */ static int pos = 0; /* position in msg buffer */
for (int n = 0; n < len; n++) { for (int n = 0; n < len; n++) {
msg[pos] = sbuf[n]; msg[pos] = sbuf[n];
if ((n > 0 && sbuf[n] == '\n' && sbuf[n - 1] == '\r') ) { /* If we got a full message */ if ((pos > 0 && msg[pos] == '\n' && msg[pos - 1] == '\r') ) { /* If we got a full message */
write(PARENT_WRITE, msg, n); write(PARENT_WRITE, msg, pos + 1);
msg[pos - 1] = '\0'; msg[pos - 1] = '\0';
printf("<<< %s\n", msg); printf("<<< %s\n", msg);
pos = 0; /* we reinitialise pos for the next run */ pos = 0; /* we reinitialise pos for the next run */

14
src/dbg.h Normal file
View file

@ -0,0 +1,14 @@
#ifndef _DBG_H_
#define _DBG_H_
#include <sys/syscall.h>
#include <sys/types.h>
#include <unistd.h>
#define DBG(fmt, ...) \
do { \
/*fprintf(stderr, "%s:%d:%lu " fmt "\n", __FILE__, __LINE__, pthread_self(), ##__VA_ARGS__);*/ \
fprintf(stderr, "%s:%d:%lu " fmt "\n", __FILE__, __LINE__, syscall(SYS_gettid), ##__VA_ARGS__); \
} while (0)
#endif