File smpppd-1.59-no_getcfg.diff of Package smpppd

Overview Repositories Revisions Requests Users Attributes Meta

File smpppd-1.59-no_getcfg.diff of Package smpppd (Revision 91b09a53d79b33a6b1d05c5131902016)

Currently displaying revision 91b09a53d79b33a6b1d05c5131902016 , Show latest

remove getcfg-interface calls and use device name directly instead

Index: smpppd-1.59/smpppd/dsl.cc
===================================================================
--- smpppd-1.59.orig/smpppd/dsl.cc
+++ smpppd-1.59/smpppd/dsl.cc
@@ -48,22 +48,6 @@ DSL::start ()
 {
     dprintf ("%s\n", __PRETTY_FUNCTION__);
 
-    string interface = dslconfig->device;
-
-    if (dslconfig->ppp_mode == DSLConfig::PPP ||
-	dslconfig->ppp_mode == DSLConfig::PPPOE ||
-	dslconfig->ppp_mode == DSLConfig::PPPOE_RP)
-    {
-	if (!getcfg_interface (dslconfig->device, &interface))
-	{
-	    logit (true, "error: cannot read real interface for %s.",
-		   dslconfig->device.c_str ());
-	    return false;
-	}
-
-	logit (false, "Interface is %s.", interface.c_str ());
-    }
-
     pppd.clear ();
 
     if (!check_ext_prog (_PATH_PPPD))
@@ -72,7 +56,7 @@ DSL::start ()
     pppd << _PATH_PPPD;
 
     if (dslconfig->ppp_mode == DSLConfig::PPP) {
-	pppd << interface;
+	pppd << dslconfig->device;
 	pppd << dslconfig->baud_rate;
     }
 
@@ -108,7 +92,7 @@ DSL::start ()
 
 	    // The device must be passed after the "call pppoe", since the
 	    // "call pppoe" loads the plugin that can handle the device.
-	    pppd << interface.c_str ();
+	    pppd << dslconfig->device.c_str ();
 
 	} break;
 
@@ -122,7 +106,7 @@ DSL::start ()
 		return false;
 
 	    string pty_cmd = "/usr/sbin/pppoe";
-	    pty_cmd += " -I " + interface + " -T 120 -m " +
+	    pty_cmd += " -I " + dslconfig->device + " -T 120 -m " +
 		tostring (dslconfig->mtu > 1452 ? 1452 : dslconfig->mtu);
 	    pppd << "pty" << pty_cmd;
 
Index: smpppd-1.59/smpppd/utils.cc
===================================================================
--- smpppd-1.59.orig/smpppd/utils.cc
+++ smpppd-1.59/smpppd/utils.cc
@@ -293,16 +293,3 @@ read_first_line_from_file (const char* f
 }
 
 
-bool
-getcfg_interface (const string& device, string* interface)
-{
-    string cmd = "/sbin/getcfg-interface " + device;
-
-    FILE* pin = popen (cmd.c_str (), "r");
-    if (!pin)
-	return false;
-
-    getline (pin, interface);
-
-    return pclose (pin) == 0;
-}
Index: smpppd-1.59/smpppd/utils.h
===================================================================
--- smpppd-1.59.orig/smpppd/utils.h
+++ smpppd-1.59/smpppd/utils.h
@@ -115,8 +115,4 @@ bool
 read_first_line_from_file (const char* filename, string* line);
 
 
-bool
-getcfg_interface (const string& device, string* interface);
-
-
 #endif

Places

File smpppd-1.59-no_getcfg.diff of Package smpppd (Revision 91b09a53d79b33a6b1d05c5131902016)

Places