HERE COMES YOUR WATER! ....

Ok, so what exactly are we looking at here?  A slapped-together pile of stuff that uses libdhcp instead of pump.  I call it a work in progress.  Right now we have support for regular IPv4-based installs.  IPv6 is sort-of halfway there.  I'm still wedging it in to place (i.e., dodging sigsegvs).  I wanted to get an IPv4-libdhcp-move committed now so that it's in CVS.  The pump-compatible API in libdhcp is mostly useless, so I'm moving things from using the core-dumping pump API functions to just using the libdhcp stuff directly.  I had to back out a lot of IPv6 stuff I did in the interim.

Please avoid making huge changes to the loader2 network code because I'm still tearing through that.

1 files changed, 5 insertions, 1 deletions

diff --git a/loader2/telnetd.c b/loader2/telnetd.c
index e5610e409..6c3bfef66 100644
--- a/loader2/telnetd.c
+++ b/loader2/telnetd.c
@@ -228,14 +228,18 @@ int beTelnet(int flags) {
 void startTelnetd(struct loaderData_s * loaderData,
                   moduleInfoSet modInfo, moduleList modLoaded, 
                   moduleDeps modDeps, int flags) {
+    char ret[47];
     struct networkDeviceConfig netCfg;
+    ip_addr_t *tip;
 
     if (kickstartNetworkUp(loaderData, &netCfg, flags)) {
         logMessage(ERROR, "unable to bring up network");
         return;
     }
 
-    logMessage(INFO, "going to beTelnet for %s", inet_ntoa(netCfg.dev.ip));
+    tip = &(netCfg.dev.ip);
+    inet_ntop(tip->sa_family, IP_ADDR(tip), ret, IP_STRLEN(tip));
+    logMessage(INFO, "going to beTelnet for %s", ret);
     if (!beTelnet(flags))
         flags |= LOADER_FLAGS_TEXT | LOADER_FLAGS_NOSHELL;