general: move link_status to an argument to nework

We are going to have link up messages in syslog, we we'd better pass it over and not do network thiings in main. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

general: move link_status to an argument to nework
We are going to have link up messages in syslog, we we'd better pass it over and not do network thiings in main. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
c7de869b · Alessandro Rubini · da67d928 · c7de869b · c7de869b · c7de869b
Commit c7de869b authored Jan 14, 2016 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 15 deletions

ptpd_netif.h include/ptpd_netif.h +5 -0

ipv4.c lib/ipv4.c +5 -3

ipv4.h lib/ipv4.h +2 -2

syslog.c lib/syslog.c +1 -1

wrc_main.c wrc_main.c +1 -9

No files found.
--- a/include/ptpd_netif.h
+++ b/include/ptpd_netif.h
@@ -18,6 +18,11 @@
 #define PTPD_SOCK_UDP		0 /* wrong name, it should be "WRPC" */
 #define PTPD_SOCK_RAW_ETHERNET 	1 /* but used in ppsi, which I won't change */

+#define LINK_WENT_UP 1
+#define LINK_WENT_DOWN 2
+#define LINK_UP 3
+#define LINK_DOWN 4
+
 // GCC-specific
 #ifndef PACKED
 #  define PACKED __attribute__((packed))

--- a/lib/ipv4.c
+++ b/lib/ipv4.c
@@ -51,7 +51,7 @@ static struct wrpc_socket *rdate_socket;
 void __attribute__((weak)) syslog_init(void)
 { }

-void __attribute__((weak)) syslog_poll(void)
+void __attribute__((weak)) syslog_poll(int l_status)
 { }

 unsigned int ipv4_checksum(unsigned short *buf, int shorts)
@@ -160,15 +160,17 @@ static void rdate_poll(void)

 }

-void ipv4_poll(void)
+void ipv4_poll(int l_status)
 {
+	if (l_status == LINK_WENT_UP)
+		needIP = 1;
 	bootp_poll();

 	icmp_poll();

 	rdate_poll();

-	syslog_poll();
+	syslog_poll(l_status);
 }

 void getIP(unsigned char *IP)

--- a/lib/ipv4.h
+++ b/lib/ipv4.h
@@ -34,7 +34,7 @@
 #define UDP_END		(UDP_CHECKSUM+2)

 void ipv4_init(void);
-void ipv4_poll(void);
+void ipv4_poll(int l_status);

 /* Internal to IP stack: */
 unsigned int ipv4_checksum(unsigned short *buf, int shorts);
@@ -61,6 +61,6 @@ struct wr_udp_addr {
 void fill_udp(uint8_t * buf, int len, struct wr_udp_addr *uaddr);

 void syslog_init(void);
-void syslog_poll(void);
+void syslog_poll(int l_status);

 #endif
--- a/lib/syslog.c
+++ b/lib/syslog.c
@@ -54,7 +54,7 @@ DEFINE_WRC_COMMAND(mac) = {
 };


-void syslog_poll(void)
+void syslog_poll(int l_satus)
 {
 	struct wr_sockaddr addr;
 	char buf[128];

--- a/wrc_main.c
+++ b/wrc_main.c
@@ -96,11 +96,6 @@ static void wrc_initialize(void)
 	}
 }

-#define LINK_WENT_UP 1
-#define LINK_WENT_DOWN 2
-#define LINK_UP 3
-#define LINK_DOWN 4
-
 static int wrc_check_link(void)
 {
 	static int prev_link_state = -1;
@@ -185,13 +180,10 @@ int main(void)

 		switch (l_status) {
 		case LINK_WENT_UP:
-			needIP = 1;
-			break;
-
 		case LINK_UP:
 			update_rx_queues();
 			if (HAS_IP) {
-				ipv4_poll();
+				ipv4_poll(l_status);
 				arp_poll();
 			}
 			break;