diff options
Diffstat (limited to 'kppp')
| -rw-r--r-- | kppp/connect.cpp | 1 | ||||
| -rw-r--r-- | kppp/devices.h | 61 | ||||
| -rw-r--r-- | kppp/logview/kppplogview.desktop | 1 | ||||
| -rw-r--r-- | kppp/opener.cpp | 2 | ||||
| -rw-r--r-- | kppp/ppplog.cpp | 3 | ||||
| -rw-r--r-- | kppp/pppstats.cpp | 5 |
6 files changed, 49 insertions, 24 deletions
diff --git a/kppp/connect.cpp b/kppp/connect.cpp index 1203f4ba..6cf6e2ae 100644 --- a/kppp/connect.cpp +++ b/kppp/connect.cpp @@ -1253,6 +1253,7 @@ bool ConnectWidget::execppp() { command += " " + gpppdata.speed(); command += " -detach"; + command += " call kppp-options"; if(gpppdata.ipaddr() != "0.0.0.0" || gpppdata.gateway() != "0.0.0.0") { diff --git a/kppp/devices.h b/kppp/devices.h index 9a78b5b0..63bde2ec 100644 --- a/kppp/devices.h +++ b/kppp/devices.h @@ -37,41 +37,56 @@ static const char *devices[] = { "/dev/dtyU3", #elif defined (__linux__) "/dev/modem", + "/dev/modem0", + "/dev/modem1", + "/dev/modem2", + "/dev/modem3", "/dev/ttyS0", "/dev/ttyS1", "/dev/ttyS2", "/dev/ttyS3", "/dev/ttyS4", -#ifdef ISDNSUPPORT - "/dev/ttyI0", - "/dev/ttyI1", - "/dev/ttyI2", - "/dev/ttyI3", -#endif + "/dev/ttyS5", + "/dev/ttyS6", + "/dev/ttyS7", + "/dev/ttyS8", + "/dev/ttyS9", + "/dev/ttyS10", + "/dev/ttyS11", + "/dev/ttyS12", + "/dev/ttyS13", + "/dev/ttyS14", + "/dev/ttyS15", + "/dev/ttyS16", + "/dev/ttyS17", + "/dev/noz0", + "/dev/noz1", + "/dev/noz2", + "/dev/noz3", + "/dev/ttyACM0", + "/dev/ttyACM1", + "/dev/ttyACM2", + "/dev/ttyACM3", "/dev/usb/ttyACM0", /* USB stuff modems */ "/dev/usb/ttyACM1", "/dev/usb/ttyACM2", "/dev/usb/ttyACM3", + "/dev/ttyUSB0", + "/dev/ttyUSB1", + "/dev/ttyUSB2", + "/dev/ttyUSB3", "/dev/usb/ttyUSB0", /* USB stuff modems */ "/dev/usb/ttyUSB1", "/dev/usb/ttyUSB2", "/dev/usb/ttyUSB3", - "/dev/ttyACM0", /* USB stuff modems with udev */ - "/dev/ttyACM1", - "/dev/ttyACM2", - "/dev/ttyACM3", - "/dev/ttyUSB0", - "/dev/ttyUSB1", - "/dev/ttyUSB2", - "/dev/ttyUSB3", - "/dev/usb/tts/0", /* USB stuff modems with devfs*/ - "/dev/usb/tts/1", - "/dev/usb/tts/2", - "/dev/usb/tts/3", "/dev/rfcomm0", /* BlueTooth */ "/dev/rfcomm1", "/dev/rfcomm2", "/dev/rfcomm3", + "/dev/bluetooth/rfcomm/0", + "/dev/bluetooth/rfcomm/1", + "/dev/bluetooth/rfcomm/2", + "/dev/bluetooth/rfcomm/3", "/dev/ircomm0", /* IrDA */ "/dev/ircomm1", "/dev/ircomm2", @@ -84,6 +99,16 @@ static const char *devices[] = { "/dev/ttySHSF1", "/dev/ttySHSF2", "/dev/ttySHSF3", /* necessary for conexant modem which use hsfserial commercial module */ + "/dev/ttySLT0", /* Lucent winmodem devices */ + "/dev/ttySLT1", + "/dev/ttySLT2", + "/dev/ttySLT3", +#ifdef ISDNSUPPORT + "/dev/ttyI0", + "/dev/ttyI1", + "/dev/ttyI2", + "/dev/ttyI3", +#endif #elif defined(__svr4__) "/dev/cua/a", "/dev/cua/b", diff --git a/kppp/logview/kppplogview.desktop b/kppp/logview/kppplogview.desktop index 45b0ffa6..39ba64f6 100644 --- a/kppp/logview/kppplogview.desktop +++ b/kppp/logview/kppplogview.desktop @@ -75,3 +75,4 @@ Type=Application Terminal=false X-DCOP-ServiceType=Multi Categories=Qt;KDE;Network;X-KDE-More;Dialup; +NoDisplay=true diff --git a/kppp/opener.cpp b/kppp/opener.cpp index be72f631..049f7218 100644 --- a/kppp/opener.cpp +++ b/kppp/opener.cpp @@ -72,8 +72,6 @@ extern "C" int _Precvmsg(int, void*, int); # include <net/ppp_layer/ppp_defs.h> # include <net/if.h> # include <net/ppp/if_ppp.h> -# elif defined HAVE_LINUX_IF_PPP_H -# include <linux/if_ppp.h> # endif #else # include <net/ppp_defs.h> diff --git a/kppp/ppplog.cpp b/kppp/ppplog.cpp index 76b0903b..fae9b048 100644 --- a/kppp/ppplog.cpp +++ b/kppp/ppplog.cpp @@ -188,7 +188,10 @@ void PPPL_AnalyseLog(QStringList &list, QStringList &result) { } if (result.isEmpty()) + { result.append(i18n("Unable to provide help.")); + result.append("Please refer to /usr/share/doc/kppp/README.Debian for more information."); + } } diff --git a/kppp/pppstats.cpp b/kppp/pppstats.cpp index b5199e60..8063d618 100644 --- a/kppp/pppstats.cpp +++ b/kppp/pppstats.cpp @@ -71,10 +71,7 @@ #endif #include <sys/socket.h> /* *BSD, Linux, NeXT, Ultrix etc. */ #ifndef HAVE_NET_IF_PPP_H - #ifdef HAVE_LINUX_IF_PPP_H - #include <linux/if.h> - #include <linux/if_ppp.h> - #elif defined(__DragonFly__) + #if defined(__DragonFly__) #include <net/if.h> #include <net/ppp/if_ppp.h> #endif |