From 0eaf514b1f97cb1587815104477e43c50a3eebe6 Mon Sep 17 00:00:00 2001 From: Uros Majstorovic Date: Mon, 31 Jan 2022 07:53:13 +0100 Subject: fixed build sys --- ecp/platform/posix/Makefile | 20 ++++++++ ecp/platform/posix/time.c | 24 +++++++++ ecp/platform/posix/transport.c | 113 +++++++++++++++++++++++++++++++++++++++++ ecp/platform/posix/transport.h | 7 +++ 4 files changed, 164 insertions(+) create mode 100644 ecp/platform/posix/Makefile create mode 100644 ecp/platform/posix/time.c create mode 100644 ecp/platform/posix/transport.c create mode 100644 ecp/platform/posix/transport.h (limited to 'ecp/platform/posix') diff --git a/ecp/platform/posix/Makefile b/ecp/platform/posix/Makefile new file mode 100644 index 0000000..aebb994 --- /dev/null +++ b/ecp/platform/posix/Makefile @@ -0,0 +1,20 @@ +include ../posix.mk +CFLAGS += -I../../src + +obj_tr = transport.o +obj_tm = time.o + + +%.o: %.c + $(CC) $(CFLAGS) -c $< + +all: libecptr.a libecptm.a + +libecptr.a: $(obj_tr) + $(AR) rcs libecptr.a $(obj_tr) + +libecptm.a: $(obj_tm) + $(AR) rcs libecptm.a $(obj_tm) + +clean: + rm -f *.o *.a diff --git a/ecp/platform/posix/time.c b/ecp/platform/posix/time.c new file mode 100644 index 0000000..111e598 --- /dev/null +++ b/ecp/platform/posix/time.c @@ -0,0 +1,24 @@ +#include +#include + +#include +#include + +int ecp_tm_init(ECPContext *ctx) { + return ECP_OK; +} + +ecp_cts_t ecp_tm_abstime_ms(ecp_cts_t msec) { + struct timeval tv; + ecp_cts_t ms_now; + + gettimeofday(&tv, NULL); + ms_now = tv.tv_sec * 1000 + tv.tv_usec / 1000; + return ms_now + msec; +} + +void ecp_tm_sleep_ms(ecp_cts_t msec) { + usleep(msec*1000); +} + +void ecp_tm_timer_set(ecp_cts_t next) {} \ No newline at end of file diff --git a/ecp/platform/posix/transport.c b/ecp/platform/posix/transport.c new file mode 100644 index 0000000..2032ce2 --- /dev/null +++ b/ecp/platform/posix/transport.c @@ -0,0 +1,113 @@ +#include +#include +#include +#include +#include + +#include +#include + +#define ADDR_S_MAX 32 + +int ecp_tr_init(ECPContext *ctx) { + return ECP_OK; +} + +int ecp_tr_addr_eq(ECPNetAddr *addr1, ECPNetAddr *addr2) { + if (addr1->port != addr2->port) return 0; + if (memcmp(addr1->host, addr2->host, sizeof(addr1->host)) != 0) return 0; + return 1; +} + +int ecp_tr_addr_set(ECPNetAddr *addr, void *addr_s) { + int rv; + char addr_c[ADDR_S_MAX]; + char *colon = NULL; + char *endptr = NULL; + uint16_t hport; + + memset(addr_c, 0, sizeof(addr_c)); + strncpy(addr_c, addr_s, ADDR_S_MAX-1); + colon = strchr(addr_c, ':'); + if (colon == NULL) return -1; + *colon = '\0'; + colon++; + if (*colon == '\0') return -1; + rv = inet_pton(AF_INET, addr_c, addr->host); + if (rv != 1) return -1; + hport = strtol(colon, &endptr, 10); + if (*endptr != '\0') return -1; + addr->port = htons(hport); + + return 0; +} + +int ecp_tr_open(ECPSocket *sock, void *addr_s) { + struct sockaddr_in _myaddr; + + memset((char *)&_myaddr, 0, sizeof(_myaddr)); + _myaddr.sin_family = AF_INET; + if (addr_s) { + ECPNetAddr addr; + int rv = ecp_tr_addr_set(&addr, addr_s); + if (rv) return rv; + + memcpy((void *)&_myaddr.sin_addr, addr.host, sizeof(addr.host)); + _myaddr.sin_port = addr.port; + } else { + _myaddr.sin_addr.s_addr = htonl(INADDR_ANY); + _myaddr.sin_port = htons(0); + } + + sock->sock = socket(PF_INET, SOCK_DGRAM, 0); + if (sock->sock < 0) return sock->sock; + + int rv = bind(sock->sock, (struct sockaddr *)&_myaddr, sizeof(_myaddr)); + if (rv < 0) { + close(sock->sock); + return rv; + } + return ECP_OK; +} + +void ecp_tr_close(ECPSocket *sock) { + close(sock->sock); +} + +ssize_t ecp_tr_send(ECPSocket *sock, ECPBuffer *packet, size_t msg_size, ECPNetAddr *addr, unsigned char flags) { + struct sockaddr_in servaddr; + + memset((void *)&servaddr, 0, sizeof(servaddr)); + servaddr.sin_family = AF_INET; + servaddr.sin_port = addr->port; + memcpy((void *)&servaddr.sin_addr, addr->host, sizeof(addr->host)); + return sendto(sock->sock, packet->buffer, msg_size, 0, (struct sockaddr *)&servaddr, sizeof(servaddr)); +} + +ssize_t ecp_tr_recv(ECPSocket *sock, ECPBuffer *packet, ECPNetAddr *addr, int timeout) { + struct sockaddr_in servaddr; + socklen_t addrlen = sizeof(servaddr); + struct pollfd fds[] = { + {sock->sock, POLLIN, 0} + }; + + int rv = poll(fds, 1, timeout); + memset((void *)&servaddr, 0, sizeof(servaddr)); + if (rv == 1) { + ssize_t recvlen = recvfrom(sock->sock, packet->buffer, packet->size, 0, (struct sockaddr *)&servaddr, &addrlen); + if (recvlen < 0) return recvlen; + if (recvlen < ECP_MIN_PKT) return ECP_ERR_RECV; + + if (addr) { + addr->port = servaddr.sin_port; + memcpy(addr->host, (void *)&servaddr.sin_addr, sizeof(addr->host)); + } + return recvlen; + } + return ECP_ERR_TIMEOUT; +} + +void ecp_tr_release(ECPBuffer *packet, unsigned char more) {} +void ecp_tr_flag_set(unsigned char flags) {} +void ecp_tr_flag_clear(unsigned char flags) {} + diff --git a/ecp/platform/posix/transport.h b/ecp/platform/posix/transport.h new file mode 100644 index 0000000..155bd9c --- /dev/null +++ b/ecp/platform/posix/transport.h @@ -0,0 +1,7 @@ +#define ECP_IPv4_ADDR_SIZE 4 + +typedef int ECPNetSock; +typedef struct ECPNetAddr { + unsigned char host[ECP_IPv4_ADDR_SIZE]; + uint16_t port; +} ECPNetAddr; -- cgit v1.2.3