From 0e25563b4aaad1aea65535b5936e2cad9cc9fd88 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Thu, 25 Sep 2025 16:21:41 -0400 Subject: build: Generate shared library API for o.1p Signed-off-by: Ian Moffett --- .gitignore | 2 + Makefile | 27 +++++++---- examples/hello.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/main.c | 142 ------------------------------------------------------- 4 files changed, 155 insertions(+), 150 deletions(-) create mode 100644 examples/hello.c delete mode 100644 src/main.c diff --git a/.gitignore b/.gitignore index e660fd9..b5cdb72 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ bin/ +*.o +*.so diff --git a/Makefile b/Makefile index e949046..bb7b2c8 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,23 @@ CFILES = $(shell find src/ -name "*.c") -CFLAGS = -Isrc/include/ -pedantic -OUTPUT = bin/otrx +OBJ = $(CFILES:.c=.o) +CFLAGS = -Isrc/include/ -pedantic -fPIC +OUTPUT = libonet.so CC = gcc -.PHONY: all -all: bin - $(CC) $(CFILES) $(CFLAGS) -o $(OUTPUT) +$(OUTPUT): $(OBJ) + $(CC) -shared -o $@ $(OBJ) -.PHONY: bin -bin: - mkdir -p $@ +%.o: %.c + $(CC) -c $(CFLAGS) $< -o $@ + +.PHONY: install +install: + mkdir -p /usr/include/onet/ + cp -r src/include/* /usr/include/onet/ + cp libonet.so /usr/lib/ + chmod 0755 /usr/lib/libonet.so + ldconfig + +.PHONY: clean +clean: + rm -f $(OBJ) diff --git a/examples/hello.c b/examples/hello.c new file mode 100644 index 0000000..dfa7767 --- /dev/null +++ b/examples/hello.c @@ -0,0 +1,134 @@ +/* + * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team. + * 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. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * 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 OWNER 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 +#include +#include +#include +#include +#include + +#define TEST_STR "Hello from o.1p!! Meow meow!" + +static const char *iface = NULL; +static bool do_recv = false; + +static void +help(char **argv) +{ + printf( + "usage: %s -i \n" + "[-h] Show this message\n" + "[-i] Interface to use\n", + argv[0] + ); +} + +static int +data_send(void) +{ + struct onet_link link; + int error; + + /* Open a link */ + error = onet_open(iface, &link); + if (error < 0) { + return error; + } + + /* Send test packet to FF:FF:FF:FF:FF:FF */ + dgram_send( + &link, 0xFFFFFFFFFFFF, + TEST_STR, sizeof(TEST_STR) + ); + + onet_close(&link); + return 0; +} + +static int +data_recv(void) +{ + char buf[sizeof(TEST_STR) + 8]; + struct onet_link link; + int error; + + /* Open a link */ + error = onet_open(iface, &link); + if (error < 0) { + return error; + } + + memset(buf, 0, sizeof(buf)); + + /* Recv data */ + dgram_recv( + &link, buf, + sizeof(TEST_STR) + ); + + printf("%s\n", buf); + onet_close(&link); + return 0; +} + +int +main(int argc, char **argv) +{ + int opt, error; + + if (argc < 2) { + printf("error: too few arguments!\n"); + help(argv); + return -1; + } + + while ((opt = getopt(argc, argv, "i:hr")) != -1) { + switch (opt) { + case 'h': + help(argv); + return -1; + case 'i': + iface = optarg; + break; + case 'r': + do_recv = true; + break; + } + } + + /* We need an interface */ + if (iface == NULL) { + printf("error: interface not supplied\n"); + return -1; + } + + error = do_recv ? data_recv() : data_send(); + return error; +} diff --git a/src/main.c b/src/main.c deleted file mode 100644 index c2087e7..0000000 --- a/src/main.c +++ /dev/null @@ -1,142 +0,0 @@ -/* - * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team. - * 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. - * 3. Neither the name of Hyra nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * 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 OWNER 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "if_ether.h" -#include "dgram.h" -#include "link.h" - -#define TEST_STR "Hello from o.1p!! Meow meow!" - -static const char *iface = NULL; -static bool do_recv = false; - -static void -help(char **argv) -{ - printf( - "usage: %s -i \n" - "[-h] Show this message\n" - "[-i] Interface to use\n", - argv[0] - ); -} - -static int -data_send(void) -{ - struct onet_link link; - int error; - - /* Open a link */ - error = onet_open(iface, &link); - if (error < 0) { - return error; - } - - /* Send test packet to FF:FF:FF:FF:FF:FF */ - dgram_send( - &link, 0xFFFFFFFFFFFF, - TEST_STR, sizeof(TEST_STR) - ); - - onet_close(&link); - return 0; -} - -static int -data_recv(void) -{ - char buf[sizeof(TEST_STR) + 8]; - struct onet_link link; - int error; - - /* Open a link */ - error = onet_open(iface, &link); - if (error < 0) { - return error; - } - - memset(buf, 0, sizeof(buf)); - - /* Recv data */ - dgram_recv( - &link, buf, - sizeof(TEST_STR) - ); - - printf("%s\n", buf); - onet_close(&link); - return 0; -} - -int -main(int argc, char **argv) -{ - int opt, error; - - if (argc < 2) { - printf("error: too few arguments!\n"); - help(argv); - return -1; - } - - while ((opt = getopt(argc, argv, "i:hr")) != -1) { - switch (opt) { - case 'h': - help(argv); - return -1; - case 'i': - iface = optarg; - break; - case 'r': - do_recv = true; - break; - } - } - - /* We need an interface */ - if (iface == NULL) { - printf("error: interface not supplied\n"); - return -1; - } - - error = do_recv ? data_recv() : data_send(); - return error; -} -- cgit v1.2.3