--- a/client/message.c Sun Nov 30 18:17:49 2025 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2025 Olaf Wintermann. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "message.h"
-
-MessageHandler* simple_msg_handler(int in, int out, msg_received_callback callback) {
- SimpleMessageHandler *handler = malloc(sizeof(SimpleMessageHandler));
- handler->handler.start = simple_msg_handler_start;
- handler->handler.stop = simple_msg_handler_stop;
- handler->handler.send = simple_msg_handler_send;
- handler->handler.callback = callback;
- handler->in = in;
- handler->out = out;
- handler->outbuf = cxBufferCreate(NULL, 4096, NULL, CX_BUFFER_FREE_CONTENTS | CX_BUFFER_AUTO_EXTEND);
- handler->stop = 0;
- pthread_mutex_init(&handler->queue_lock, NULL);
- pthread_mutex_init(&handler->avlbl_lock, NULL);
- pthread_cond_init(&handler->available, NULL);
- return (MessageHandler*)handler;
-}
-
-int simple_msg_handler_start(MessageHandler *handler) {
- SimpleMessageHandler *sh = (SimpleMessageHandler*)handler;
- if(pthread_create(&sh->in_thread, NULL, simple_msg_handler_in_thread, sh)) {
- return 1;
- }
- if(pthread_create(&sh->out_thread, NULL, simple_msg_handler_out_thread, sh)) {
- return 1;
- }
- return 0;
-}
-
-int simple_msg_handler_stop(MessageHandler *handler) {
- SimpleMessageHandler *sh = (SimpleMessageHandler*)handler;
- pthread_mutex_lock(&sh->queue_lock);
- sh->stop = 0;
- pthread_cond_signal(&sh->available);
- pthread_mutex_unlock(&sh->queue_lock);
- close(sh->in);
- sh->in = -1;
-
- pthread_join(sh->in_thread, NULL);
- pthread_join(sh->out_thread, NULL);
-
- return 0;
-}
-
-int simple_msg_handler_send(MessageHandler *handler, cxstring msg) {
- SimpleMessageHandler *sh = (SimpleMessageHandler*)handler;
- pthread_mutex_lock(&sh->queue_lock);
- cxBufferWrite(msg.ptr, 1, msg.length, sh->outbuf);
- pthread_cond_signal(&sh->available);
- pthread_mutex_unlock(&sh->queue_lock);
- return 0;
-}
-
-#define HEADERBUF_SIZE 64
-
-void* simple_msg_handler_in_thread(void *data) {
- SimpleMessageHandler *handler = data;
-
- char *msg = NULL;
- size_t msg_size = 0;
- size_t msg_pos = 0; // currently received message length
-
- char headerbuf[HEADERBUF_SIZE];
- size_t headerpos = 0;
-
- char buf[2048];
- ssize_t r;
- while((r = read(handler->in, buf, 2024)) > 0) {
- char *buffer = buf;
- size_t available = r;
-
- while(available > 0) {
- if(msg) {
- // read message
- size_t need = msg_size - msg_pos;
- size_t cplen = r > need ? need : available;
- memcpy(msg+msg_pos, buffer, cplen);
- buffer += cplen;
- available -= cplen;
- msg_pos += cplen;
- if(msg_pos == msg_size) {
- // message complete
- //fprintf(stderr, "send: %.*s\n", (int)msg_size, msg);
- if(handler->handler.callback) {
- handler->handler.callback(cx_mutstrn(msg, msg_size));
- }
- msg = NULL;
- msg_size = 0;
- msg_pos = 0;
- }
- } else {
- size_t header_max = HEADERBUF_SIZE - headerpos - 1;
- if(header_max > available) {
- header_max = available;
- }
- // search for line break
- int i;
- int header_complete = 0;
- for(i=0;i<header_max;i++) {
- if(buffer[i] == '\n') {
- header_complete = 1;
- break;
- }
- }
- i++;
- memcpy(headerbuf+headerpos, buffer, i);
- headerpos += i;
- buffer += i;
- available -= i;
-
- if(header_complete) {
- headerbuf[headerpos-1] = 0; // terminate buffer
- char *end;
- long length = strtol(headerbuf, &end, 10);
- if(*end == '\0') {
- //fprintf(stderr, "header: %d\n", (int)length);
- msg = malloc(length);
- msg_size = length;
- headerpos = 0;
- } else {
- fprintf(stderr, "Error: invalid message {%s}\n", headerbuf);
- }
- } else if(headerpos+1 >= HEADERBUF_SIZE) {
- fprintf(stderr, "Error: message header too big\n");
- exit(-1);
- }
- }
- }
-
-
- }
- perror("error");
- fprintf(stderr, "stop simple_msg_handler_in_thread\n");
-
- return NULL;
-}
-
-void* simple_msg_handler_out_thread(void *data) {
- SimpleMessageHandler *handler = data;
-
- return NULL;
-}