[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAL3m8eCcZkn2YDAHyf1Ns4a4Zcz0Mk3ENrdby8tarCoKEc+qkw@mail.gmail.com>
Date: Sun, 14 Apr 2013 16:27:08 -0500
From: Strake <strake888@...il.com>
To: musl <musl@...ts.openwall.com>
Subject: [patch] add ether_(aton, ntoa)
>From 0166471873b3aa801ac4e6301350b08d65e8f24f Mon Sep 17 00:00:00 2001
From: Strake <strake888@...il.com>
Date: Sun, 14 Apr 2013 12:09:30 -0500
Subject: [PATCH] add ether_(aton, ntoa)
---
include/netinet/ether.h | 14 ++++++++++++++
src/network/ether_aton.c | 23 +++++++++++++++++++++++
src/network/ether_ntoa.c | 17 +++++++++++++++++
3 files changed, 54 insertions(+)
create mode 100644 include/netinet/ether.h
create mode 100644 src/network/ether_aton.c
create mode 100644 src/network/ether_ntoa.c
diff --git a/include/netinet/ether.h b/include/netinet/ether.h
new file mode 100644
index 0000000..c5179d5
--- /dev/null
+++ b/include/netinet/ether.h
@@ -0,0 +1,14 @@
+#ifndef _NETINET_ETHER_H
+#define _NETINET_ETHER_H
+
+#include <netinet/if_ether.h>
+
+char *ether_ntoa (const struct ether_addr *);
+
+struct ether_addr *ether_aton (const char *);
+
+char *ether_ntoa_r (const struct ether_addr *, char *);
+
+struct ether_addr *ether_aton_r (const char *, struct ether_addr *);
+
+#endif
diff --git a/src/network/ether_aton.c b/src/network/ether_aton.c
new file mode 100644
index 0000000..4270872
--- /dev/null
+++ b/src/network/ether_aton.c
@@ -0,0 +1,23 @@
+#include <stdlib.h>
+#include <netinet/ether.h>
+
+static struct ether_addr a;
+
+struct ether_addr *ether_aton_r (const char *x, struct ether_addr *p_a) {
+ for (int ii = 0; ii < 6; ii++) {
+ unsigned long int n;
+ if (ii != 0) {
+ if (x[0] != ':') return 0; /* bad format */
+ else x++;
+ }
+ n = strtoul (x, &x, 16);
+ if (n > 0xFF) return 0; /* bad byte */
+ (*p_a).ether_addr_octet[ii] = n;
+ }
+ if (x[0] != 0) return 0; /* bad format */
+ return p_a;
+}
+
+struct ether_addr *ether_aton (const char *x) {
+ return ether_aton_r (x, &a);
+}
diff --git a/src/network/ether_ntoa.c b/src/network/ether_ntoa.c
new file mode 100644
index 0000000..5aaf0da
--- /dev/null
+++ b/src/network/ether_ntoa.c
@@ -0,0 +1,17 @@
+#include <stdio.h>
+#include <netinet/ether.h>
+
+static char x[18];
+
+char *ether_ntoa_r (const struct ether_addr *p_a, char *x) {
+ char *y;
+ y = x;
+ for (int ii = 0; ii < 6; ii++) {
+ x += sprintf (x, ii == 0 ? "%0hhX" : ":%0hhX", (*p_a).ether_addr_octet[ii]);
+ }
+ return y;
+}
+
+char *ether_ntoa (const struct ether_addr *p_a) {
+ return ether_ntoa_r (p_a, x);
+}
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
