diff options
| -rw-r--r-- | src/include/link.h | 63 | ||||
| -rw-r--r-- | src/link/link_subr.c | 87 | ||||
| -rw-r--r-- | src/main.c | 38 |
3 files changed, 159 insertions, 29 deletions
diff --git a/src/include/link.h b/src/include/link.h new file mode 100644 index 0000000..a791c2f --- /dev/null +++ b/src/include/link.h @@ -0,0 +1,63 @@ +/* + * 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. + */ + +#ifndef LINK_H +#define LINK_H + +#include <stdint.h> +#include "if_ether.h" + +struct onet_link { + int sockfd; + uint32_t iface_idx; + mac_addr_t hwaddr; +}; + +/* + * Open an ONET link + * + * @iface: The interface the link should be for + * @res: Result is written here + * + * Returns zero on success, otherwise a less than + * zero value on error. + */ +int onet_open(const char *iface, struct onet_link *res); + +/* + * Close an ONET link + * + * @olp: Link to close + * + * Returns zero on success, otherwise a less than + * zero value on error. + */ +int onet_close(struct onet_link *olp); + +#endif /* LINK_H */ diff --git a/src/link/link_subr.c b/src/link/link_subr.c new file mode 100644 index 0000000..d1a977d --- /dev/null +++ b/src/link/link_subr.c @@ -0,0 +1,87 @@ +/* + * 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 <sys/errno.h> +#include <sys/socket.h> +#include <sys/ioctl.h> +#include <netinet/in.h> +#include <net/if.h> +#include <net/ethernet.h> +#include <unistd.h> +#include <stdint.h> +#include <string.h> +#include <stdio.h> +#include "link.h" + +int +onet_open(const char *iface, struct onet_link *res) +{ + struct ifreq ifr; + int error; + + if (res == NULL) { + return -EINVAL; + } + + /* Open a raw socket */ + res->sockfd = socket(AF_PACKET, SOCK_RAW, IPPROTO_RAW); + if (res->sockfd < 0) { + return res->sockfd; + } + + /* Set the interface we want to use */ + strlcpy(ifr.ifr_name, iface, IFNAMSIZ); + error = ioctl(res->sockfd, SIOGIFINDEX, &ifr); + if (error < 0) { + printf("ioctl[SIOGIFHWADDR]: could not read hwaddr \"%s\"\n", iface); + return error; + } + + res->iface_idx = ifr.ifr_ifindex; + + /* Get the hardware address */ + error = ioctl(res->sockfd, SIOCGIFHWADDR, &ifr); + if (error < 0) { + printf("ioctl[SIOGIFHWADDR]: could not read hwaddr \"%s\"\n", iface); + return error; + } + + res->hwaddr = mac_swap((void *)ifr.ifr_hwaddr.sa_data); + return 0; +} + +int +onet_close(struct onet_link *olp) +{ + if (olp == NULL) { + return -EINVAL; + } + + close(olp->sockfd); +} @@ -39,6 +39,7 @@ #include <string.h> #include "if_ether.h" #include "dgram.h" +#include "link.h" #define TEST_STR "Hello from o.1p!! Meow meow!" @@ -62,10 +63,8 @@ data_send(void) struct sockaddr_ll saddr; struct ether_hdr *eth; struct onet_dgram *dgram; - struct ifreq ifr; - uint32_t ifidx; - mac_addr_t mac; - int error, sockfd; + struct onet_link link; + int error; eth = (struct ether_hdr *)data; p = DGRAM_DATA(data); @@ -74,45 +73,26 @@ data_send(void) memset(data, 0, sizeof(data)); memcpy(p, TEST_STR, sizeof(TEST_STR)); - sockfd = socket(AF_PACKET, SOCK_RAW, IPPROTO_RAW); - if (sockfd < 0) { - printf("error: failed to create socket (error=%d)\n", sockfd); - return sockfd; - } - - /* Set the interface that we want to use */ - strlcpy(ifr.ifr_name, iface, IFNAMSIZ); - error = ioctl(sockfd, SIOGIFINDEX, &ifr); - if (error < 0) { - printf("ioctl[SIOGIFINDEX]: bad iface \"%s\"\n", iface); - return error; - } - - ifidx = ifr.ifr_ifindex; - - /* Grab the hardware address */ - error = ioctl(sockfd, SIOCGIFHWADDR, &ifr); + /* Open a link */ + error = onet_open(iface, &link); if (error < 0) { - printf("ioctl[SIOGIFHWADDR]: could not read hwaddr \"%s\"\n", iface); return error; } - mac = mac_swap((void *)ifr.ifr_hwaddr.sa_data); - /* * Set up link layer sockaddr, load up the frame, datagram * and send it off. */ - saddr.sll_ifindex = ifidx; + saddr.sll_ifindex = link.iface_idx; saddr.sll_halen = ETH_ALEN; - ether_load_route(mac, 0xFFFFFFFFFFFF, eth); + ether_load_route(link.hwaddr, 0xFFFFFFFFFFFF, eth); dgram_load(sizeof(TEST_STR), 50, dgram); sendto( - sockfd, &data, sizeof(data), 0, + link.sockfd, &data, sizeof(data), 0, (struct sockaddr *)&saddr, sizeof(struct sockaddr_ll) ); - close(sockfd); + onet_close(&link); return 0; } |