Obsolete/libipc-old
Archived
3
0
Fork 0
Code

GOING 4-BYTE LENGTH, YEAH \o/

Browse Source
This commit is contained in:
Philippe PITTOLI 2018-10-12 01:59:56 +02:00
parent 48c76930a4
commit 77120450ff
7 changed files with 162 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/error.h
View File

@ -6,7 +6,7 @@
#define IPC_ERROR_NOT_ENOUGH_MEMORY 100
#define IPC_ERROR_WRONG_PARAMETERS 101
// #define IPC_WITH_ERRORS 2
// #define IPC_WITH_ERRORS 3
#ifdef IPC_WITH_ERRORS
#define handle_error(msg) \

30
core/message.c
View File

@ -16,26 +16,26 @@ int ipc_message_format_read (struct ipc_message *m, const char *buf, ssize_t msi
{
assert (m != NULL);
assert (buf != NULL);
assert (msize <= BUFSIZ - 3);
assert (msize <= IPC_MAX_MESSAGE_SIZE);
if (m == NULL)
return -1;
m->type = buf[0];
memcpy (&m->length, buf+1, 2);
memcpy (&m->length, buf+1, sizeof m->length);
assert (m->length <= BUFSIZ - 3);
assert (m->length <= IPC_MAX_MESSAGE_SIZE);
#if defined(IPC_WITH_ERRORS) && IPC_WITH_ERRORS > 2
printf ("type %d : msize = %ld, length = %d\n", m->type, msize, m->length);
printf ("type %d, paylen = %u, total = %lu\n", m->type, m->length, msize);
#endif
assert (m->length == msize - 3 || m->length == 0);
assert (m->length == msize - IPC_HEADER_SIZE || m->length == 0);
if (m->payload != NULL)
free (m->payload), m->payload = NULL;
if (m->payload == NULL && m->length > 0) {
m->payload = malloc (m->length);
memcpy (m->payload, buf+3, m->length);
memcpy (m->payload, buf+IPC_HEADER_SIZE, m->length);
}
return 0;
@ -46,7 +46,7 @@ int ipc_message_format_write (const struct ipc_message *m, char **buf, ssize_t *
assert (m != NULL);
assert (buf != NULL);
assert (msize != NULL);
assert (m->length <= BUFSIZ -3);
assert (m->length <= IPC_MAX_MESSAGE_SIZE);
if (m == NULL)
return -1;
@ -58,19 +58,19 @@ int ipc_message_format_write (const struct ipc_message *m, char **buf, ssize_t *
return -3;
if (*buf == NULL) {
*buf = malloc (3 + m->length);
memset (*buf, 0, 3 + m->length);
*buf = malloc (IPC_HEADER_SIZE + m->length);
memset (*buf, 0, IPC_HEADER_SIZE + m->length);
}
char *buffer = *buf;
buffer[0] = m->type;
memcpy (buffer + 1, &m->length, 2);
memcpy (buffer + 1, &m->length, sizeof m->length);
if (m->payload != NULL) {
memcpy (buffer + 3, m->payload, m->length);
memcpy (buffer + IPC_HEADER_SIZE, m->payload, m->length);
}
*msize = 3 + m->length;
*msize = IPC_HEADER_SIZE + m->length;
#if defined(IPC_WITH_ERRORS) && IPC_WITH_ERRORS > 2
printf ("sending msg: type %u, size %d, msize %ld\n", m->type, m->length, *msize);
@ -85,7 +85,7 @@ int ipc_message_read (int fd, struct ipc_message *m)
assert (m != NULL);
char *buf = NULL;
ssize_t msize = BUFSIZ;
ssize_t msize = IPC_MAX_MESSAGE_SIZE;
int ret = usock_recv (fd, &buf, &msize);
if (ret < 0) {
@ -143,10 +143,10 @@ int ipc_message_write (int fd, const struct ipc_message *m)
int ipc_message_format (struct ipc_message *m, char type, const char *payload, ssize_t length)
{
assert (m != NULL);
assert (length + 3 <= BUFSIZ);
assert (length <= IPC_MAX_MESSAGE_SIZE);
assert ((length == 0 && payload == NULL) || (length > 0 && payload != NULL));
if (length + 3 > BUFSIZ) {
if (length > IPC_MAX_MESSAGE_SIZE) {
handle_err ("msg_format_con", "msgsize > BUFSIZ");
return -1;
}

2
core/message.h
View File

@ -16,7 +16,7 @@ enum msg_types {
struct ipc_message {
char type;
unsigned short length;
unsigned int length;
char *payload;
};

27
core/usocket.c
View File

@ -20,6 +20,7 @@ int usock_send (const int fd, const char *buf, ssize_t len, ssize_t *sent)
return 0;
}
// *len is changed to the total message size read (header + payload)
int usock_recv (const int fd, char **buf, ssize_t *len)
{
assert(buf != NULL);
@ -39,15 +40,24 @@ int usock_recv (const int fd, char **buf, ssize_t *len)
if (*buf == NULL) {
// do not allocate too much memory
if (*len > BUFSIZ) {
handle_err ("usock_recv", "len > BUFSIZ");
if (*len > IPC_MAX_MESSAGE_SIZE) {
handle_err ("usock_recv", "len > IPC_MAX_MESSAGE_SIZE");
*len = IPC_MAX_MESSAGE_SIZE;
}
if (*len == 0)
*len = BUFSIZ;
*buf = malloc ((*len < BUFSIZ) ? *len : BUFSIZ);
*buf = malloc (*len + IPC_HEADER_SIZE);
}
unsigned int msize = 0;
unsigned int msize_read = 0;
do {
ret = recv (fd, *buf, *len, 0);
if (msize == 0) {
memcpy (&msize, *buf + 1, sizeof msize);
}
assert (msize < IPC_MAX_MESSAGE_SIZE);
msize_read += ret - IPC_HEADER_SIZE;
if (ret < 0) {
if (*buf != NULL)
free (*buf);
@ -107,7 +117,12 @@ int usock_recv (const int fd, char **buf, ssize_t *len)
return -1;
}
*len = ret;
#if defined(IPC_WITH_ERRORS) && IPC_WITH_ERRORS > 2
printf ("fragmentation: message size read %u, should read %u\n", msize_read, msize);
#endif
} while (msize > msize_read);
*len = msize + IPC_HEADER_SIZE;
// 1 on none byte received, indicates a closed recipient
if (ret == 0) {

3
core/usocket.h
View File

@ -10,6 +10,9 @@
#define TMPDIR "/run/ipc/"
#define PATH_MAX 4096
#define IPC_HEADER_SIZE 5
#define IPC_MAX_MESSAGE_SIZE 8000000-IPC_HEADER_SIZE
struct ipc_service {
unsigned int version;
unsigned int index;

68
pong/app/ipc-debug.c
View File

@ -10,6 +10,8 @@
#define SERVICE_NAME "pongd"
#define MAX_MESSAGE_SIZE 20000
void interactive (char * service_name, char *env[])
{
struct ipc_message m;
@ -30,16 +32,24 @@ void interactive (char * service_name, char *env[])
char msg_type = 0;
while (1) {
#if 0 // version with readline, slow, valgrind-incompatible
char * mtype_str = readline("msg type: ");
sscanf(mtype_str, "%c", &msg_type);
if (strlen(mtype_str) == 0 || strncmp (mtype_str, "exit", 4) == 0) {
free (mtype_str);
break;
}
msg_type = atoi(mtype_str);
free(mtype_str);
char * buf = readline ("msg: ");
if (strlen(buf) == 0 || strncmp (buf, "exit", 4) == 0)
if (strlen(buf) == 0 || strncmp (buf, "exit", 4) == 0) {
free (buf);
break;
}
ipc_message_format (&m, msg_type, buf, strlen(buf));
memset (buf, 0, BUFSIZ);
free (buf);
// print_msg (&m);
@ -54,27 +64,71 @@ void interactive (char * service_name, char *env[])
exit (EXIT_FAILURE);
}
printf ("msg recv: %s", m.payload);
printf ("\nmsg recv: %s", m.payload);
ipc_message_empty (&m);
#else
char mtype_str[50];
memset(mtype_str, 0, 50);
printf ("message type: ");
fflush(stdout);
read(0, mtype_str, 50);
msg_type = atoi(mtype_str);
memset(mtype_str, 0, 50);
char mpayload[MAX_MESSAGE_SIZE];
memset(mpayload, 0, MAX_MESSAGE_SIZE);
printf ("message payload: ");
fflush(stdout);
read(0, mpayload, MAX_MESSAGE_SIZE);
if (strlen(mpayload) == 0 || strncmp (mpayload, "exit", 4) == 0) {
break;
}
ipc_message_format (&m, msg_type, mpayload, strlen(mpayload));
// print_msg (&m);
if (ipc_application_write (&srv, &m) < 0) {
handle_err("main", "application_write < 0");
exit (EXIT_FAILURE);
}
ipc_message_empty (&m);
if (msg_type == 0) { // message type 0 => close the server, no read to do
break;
}
if (ipc_application_read (&srv, &m) < 0) {
handle_err("main", "application_read < 0");
exit (EXIT_FAILURE);
}
if (m.length > 0) {
printf ("msg recv: %.*s", m.length, m.payload);
}
ipc_message_empty (&m);
#endif
}
if (ipc_application_close (&srv) < 0) {
handle_err("main", "application_close < 0");
exit (EXIT_FAILURE);
}
ipc_message_empty (&m);
}
int main (int argc, char *argv[], char *env[])
{
argc = argc; // warnings
argv = argv; // warnings
char service_name[100];
memset (service_name, 0, 100);
if (argc != 1) {
ssize_t t = strlen(argv[1]) > 100 ? 100 : strlen(argv[1]);
memcpy(service_name, argv[1], t);
}
else {
memcpy(service_name, SERVICE_NAME, strlen(SERVICE_NAME));
}
interactive (service_name, env);

4
pong/app/pongd.c
View File

@ -91,7 +91,9 @@ void handle_new_msg (struct ipc_clients *clients, struct ipc_clients *clients_ta
exit (0);
}
printf ("new message : %s", m.payload);
if (m.length > 0) {
printf ("new message : %.*s", m.length, m.payload);
}
if (ipc_server_write (pc, &m) < 0) {
handle_err( "handle_new_msg", "server_write < 0");
}