1 files changed, 87 insertions, 89 deletions

diff --git a/urunlevel/runlevel/network.c b/urunlevel/runlevel/network.c
index dff5fc1..99d4717 100644
--- a/urunlevel/runlevel/network.c
+++ b/urunlevel/runlevel/network.c
@@ -3,6 +3,8 @@
  *
  * Copyright (C) 2004 by David Seikel won_fang@yahoo.com.au
  *
+ * Originally based on code from Trinux.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -32,115 +34,111 @@ static int status(struct init_d_handle_s *init_d, int);
 static int stop(struct init_d_handle_s *, int);
 
 
-static init_d_handle_t my_commands =
-{
-    &start,
-    &stop,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    &status,
-    NULL,
-    "network",
-    NULL,
-    NULL,
-    NULL,
-    INIT_D_BEGIN \
-    INIT_D_PROV "$network" \
-    INIT_D_RSTART "$syslog" \
-    INIT_D_DSTART "3 4 5" \
-    INIT_D_DSTOP "0 1 2 6" \
-    INIT_D_SDESC "Basic network setup" \
-    INIT_D_DESC "Configures all your network interfaces," \
-    INIT_D_CONT "brings them all up and sets up routing." \
-    INIT_D_CONT "Also configures things like port forwarding," \
-    INIT_D_CONT "hostnames, etc." \
-    INIT_D_END
+static init_d_handle_t my_commands = {
+        &start,
+        &stop,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        &status,
+        NULL,
+        "network",
+        NULL,
+        NULL,
+        NULL,
+        INIT_D_BEGIN
+                INIT_D_PROV "$network"
+                INIT_D_RSTART "$syslog"
+                INIT_D_DSTART "3 4 5"
+                INIT_D_DSTOP "0 1 2 6"
+                INIT_D_SDESC "Basic network setup"
+                INIT_D_DESC "Configures all your network interfaces,"
+                INIT_D_CONT "brings them all up and sets up routing."
+                INIT_D_CONT "Also configures things like port forwarding,"
+                INIT_D_CONT "hostnames, etc." INIT_D_END
 };
 
 
 int network_main(int argc, char **argv)
 {
-    return do_init_from_main(argc, argv, &my_commands);
+        return do_init_from_main(argc, argv, &my_commands);
 }
 
 
 static int start(struct init_d_handle_s *init_d, int just_checking)
 {
-    int i;
-    int my_status = (init_d->status)(init_d, 0);
-    char *IPADDR = 0;
-
-    if (my_status == INIT_D_STATUS_NOT_RUNNING)
-    {
-        my_status = INIT_D_ERROR_NOT_RUNNING;
-//      if (stat("/proc/net/pnp", &path_stat) == 0)
-//          copy_file("/proc/net/pnp", "/etc/resolv.conf", FILEUTILS_FORCE | FILEUTILS_PRESERVE_STATUS);
-
-        fflush(stdout);
-        doit(QUIET, "ifup -af");
-        for (i = 20; stat("/var/lib/network/ipaddr", &path_stat) != 0; i--)
-        {
-            bb_printf(".");
-            fflush(stdout);
-            sleep(2);
-            if (i <= 0)
-            {
-                bb_printf(" timeout.");
-                break;
-            }
-        }
-
-        if (stat("/var/lib/network/ipaddr", &path_stat) == 0)
-            IPADDR = quick_read("/var/lib/network/ipaddr");
-
-        if ((IPADDR != 0) && (IPADDR[0] != '\0'))
-        {
-            if (stat("/proc/sys/net/ipv4/tcp_syn_retries", &path_stat) == 0)
-                quick_write("/proc/sys/net/ipv4/tcp_syn_retries", "7");
-            if (stat("/var/lib/my_linux/config/ipfwd", &path_stat) == 0)
-            {
-                bb_printf("Enabling IP forwarding\n");
-                quick_write("/proc/sys/net/ipv4/ip_forward", "1");
-            }
-            if (stat("/var/lib/my_linux/config/noping", &path_stat) == 0)
-                quick_write("/proc/sys/net/ipv4/icmp_echo_ignore_all", "1");
-            my_status = INIT_D_OK;
-        }
-        else
-            my_status = INIT_D_ERROR_GENERIC;
-
-        free(IPADDR);
-    }
-    else
-        my_status = INIT_D_OK;
-
-    return my_status;
+        int i;
+        int my_status = (init_d->status) (init_d, 0);
+        char *IPADDR = 0;
+
+        if (my_status == INIT_D_STATUS_NOT_RUNNING) {
+                my_status = INIT_D_ERROR_NOT_RUNNING;
+//  if (stat("/proc/net/pnp", &path_stat) == 0)
+//      copy_file("/proc/net/pnp", "/etc/resolv.conf", FILEUTILS_FORCE | FILEUTILS_PRESERVE_STATUS);
+
+                fflush(stdout);
+                doit(QUIET, "ifup -af");
+                for (i = 20; stat("/var/lib/network/ipaddr", &path_stat) != 0; i--) {
+                        bb_printf(".");
+                        fflush(stdout);
+                        sleep(2);
+                        if (i <= 0) {
+                                bb_printf(" timeout.");
+                                break;
+                        }
+                }
+
+                if (stat("/var/lib/network/ipaddr", &path_stat) == 0)
+                        IPADDR = quick_read("/var/lib/network/ipaddr");
+
+                if ((IPADDR != 0) && (IPADDR[0] != '\0')) {
+                        char *tcp_syn_retries = getenv("tcp_syn_retries");
+                        char *ip_forward = getenv("ip_forward");
+                        char *icmp_echo_ignore_all = getenv("icmp_echo_ignore_all");
+
+                        if (tcp_syn_retries)
+                                quick_write("/proc/sys/net/ipv4/tcp_syn_retries", tcp_syn_retries);
+                        if (ip_forward) {
+                                bb_printf("Enabling IP forwarding\n");
+                                quick_write("/proc/sys/net/ipv4/ip_forward", ip_forward);
+                        }
+                        if (icmp_echo_ignore_all)
+                                quick_write("/proc/sys/net/ipv4/icmp_echo_ignore_all", icmp_echo_ignore_all);
+                        my_status = INIT_D_OK;
+                } else
+                        my_status = INIT_D_ERROR_GENERIC;
+
+                free(IPADDR);
+        } else
+                my_status = INIT_D_OK;
+
+        return my_status;
 }
 
 
 static int status(struct init_d_handle_s *init_d, int quiet)
 {
-    int my_status = INIT_D_STATUS_NOT_RUNNING;
-    char *ip = NULL;
+        int my_status = INIT_D_STATUS_NOT_RUNNING;
+        char *ip = NULL;
 
-    bb_xasprintf(&ip, "%s", doit(REDIR, "ip -o addr | grep lo: | cut -d\" \" -f3 | cut -d\",\" -f2"));
-    if ((ip != NULL) && (strncmp("UP", ip, 2) == 0))
-        my_status = INIT_D_STATUS_OK;
+        bb_xasprintf(&ip, "%s",
+                                 doit(REDIR,
+                                          "ip -o addr | grep lo: | cut -d\" \" -f3 | cut -d\",\" -f2"));
+        if ((ip != NULL) && (strncmp("UP", ip, 2) == 0))
+                my_status = INIT_D_STATUS_OK;
 
-    return print_status(init_d, quiet, my_status);
+        return print_status(init_d, quiet, my_status);
 }
 
 
 static int stop(struct init_d_handle_s *init_d, int just_checking)
 {
-    int my_status = default_stop(init_d, 1);
-
-    if (my_status == INIT_D_ERROR_JUST_RUNNING)
-    {
-        doit(QUIET, "ifdown -af");
-        my_status = INIT_D_OK;
-    }
-    return my_status;
+        int my_status = default_stop(init_d, 1);
+
+        if (my_status == INIT_D_ERROR_JUST_RUNNING) {
+                doit(QUIET, "ifdown -af");
+                my_status = INIT_D_OK;
+        }
+        return my_status;
 }