Creating common header

4 files changed, 116 insertions, 38 deletions

diff --git a/GNUmakefile b/GNUmakefile
index 8686814..8a7c1b8 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -51,6 +51,7 @@ CFLAGS					= -O2 \
                                           -Weverything \
                                           -Wno-unknown-pragmas \
                                           -Wno-format-nonliteral \
+                                          -Wno-reserved-id-macro \
                                           -DPACKAGE_VERSION='"$(PACKAGE_VERSION)"'
 LIBTOOL                                 ?= libtool
 INSTALL                                 ?= install
@@ -70,11 +71,11 @@ OBJS					= src/akcom-udpecho.lo \
 all: $(PROGS)
 
 
-src/akcom-udpecho.lo: src/akcom-udpecho.c
+src/akcom-udpecho.lo: src/akcom-udpecho.c src/akcom-udpecho.h
         $(LIBTOOL) --mode=compile --tag=CC gcc $(CFLAGS) -o $(@) -c src/akcom-udpecho.c
 
 
-src/akcom-udpechod.lo: src/akcom-udpechod.c
+src/akcom-udpechod.lo: src/akcom-udpechod.c src/akcom-udpecho.h
         $(LIBTOOL) --mode=compile --tag=CC gcc $(CFLAGS) -o $(@) -c src/akcom-udpechod.c
 
 
diff --git a/src/akcom-udpecho.c b/src/akcom-udpecho.c
index b5111b9..4001d71 100644
--- a/src/akcom-udpecho.c
+++ b/src/akcom-udpecho.c
@@ -79,6 +79,8 @@
 #include <signal.h>
 #include <poll.h>
 
+#include "akcom-udpecho.h"
+
 
 ///////////////////
 //               //
@@ -105,24 +107,6 @@
 /////////////////
 #pragma mark - Datatypes
 
-union my_sa
-{
-   struct sockaddr         sa;
-   struct sockaddr_in      sin;
-   struct sockaddr_in6     sin6;
-   struct sockaddr_storage ss;
-};
-
-
-struct udp_echo_plus
-{
-   uint32_t  req_sn;
-   uint32_t  res_sn;
-   uint32_t  recv_time;
-   uint32_t  reply_time;
-   uint32_t  failures;
-};
-
 
 /////////////////
 //             //
diff --git a/src/akcom-udpecho.h b/src/akcom-udpecho.h
new file mode 100644
index 0000000..9851ed2
--- /dev/null
+++ b/src/akcom-udpecho.h
@@ -0,0 +1,109 @@
+/*
+ *  Alaska Communications UDP Echo Tools
+ *  Copyright (C) 2020 Alaska Communications
+ *
+ *  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 the copyright holder 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 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.
+ */
+#ifndef _AKCOM_UDP_ECHO_H
+#define _AKCOM_UDP_ECHO_H 1
+
+///////////////
+//           //
+//  Headers  //
+//           //
+///////////////
+#pragma mark - Headers
+
+
+///////////////////
+//               //
+//  Definitions  //
+//               //
+///////////////////
+#pragma mark - Definitions
+
+#ifndef PACKAGE_NAME
+#define PACKAGE_NAME "akcom-udpecho"
+#endif
+#ifndef PACKAGE_VERSION
+#define PACKAGE_VERSION "0.0"
+#endif
+
+
+/////////////////
+//             //
+//  Datatypes  //
+//             //
+/////////////////
+#pragma mark - Datatypes
+
+union my_sa
+{
+   struct sockaddr         sa;
+   struct sockaddr_in      sin;
+   struct sockaddr_in6     sin6;
+   struct sockaddr_storage ss;
+};
+
+
+struct udp_echo_plus
+{
+   uint32_t  req_sn;
+   uint32_t  res_sn;
+   uint32_t  recv_time;
+   uint32_t  reply_time;
+   uint32_t  failures;
+};
+
+
+/////////////////
+//             //
+//  Variables  //
+//             //
+/////////////////
+#pragma mark - Variables
+
+
+//////////////////
+//              //
+//  Prototypes  //
+//              //
+//////////////////
+#pragma mark - Prototypes
+
+
+/////////////////
+//             //
+//  Functions  //
+//             //
+/////////////////
+#pragma mark - Functions
+
+
+#endif
+/* end of header file */
diff --git a/src/akcom-udpechod.c b/src/akcom-udpechod.c
index 6b8071e..f7abb0f 100644
--- a/src/akcom-udpechod.c
+++ b/src/akcom-udpechod.c
@@ -81,6 +81,8 @@
 #include <pwd.h>
 #include <grp.h>
 
+#include "akcom-udpecho.h"
+
 
 ///////////////////
 //               //
@@ -114,24 +116,6 @@
 /////////////////
 #pragma mark - Datatypes
 
-union my_sa
-{
-   struct sockaddr         sa;
-   struct sockaddr_in      sin;
-   struct sockaddr_in6     sin6;
-   struct sockaddr_storage ss;
-};
-
-
-struct udp_echo_plus
-{
-   uint32_t  req_sn;
-   uint32_t  res_sn;
-   uint32_t  recv_time;
-   uint32_t  reply_time;
-   uint32_t  failures;
-};
-
 
 /////////////////
 //             //