Merge from BRANCH_1_0

1 files changed, 17 insertions, 6 deletions

diff --git a/noncore/settings/networksettings/ppp/modem.h b/noncore/settings/networksettings/ppp/modem.h
index 103cbeb..8ecc354 100644
--- a/noncore/settings/networksettings/ppp/modem.h
+++ b/noncore/settings/networksettings/ppp/modem.h
@@ -5,7 +5,7 @@
  *
  *              Copyright (C) 1997 Bernd Johannes Wuebben
  *                      wuebben@math.cornell.edu
- * 
+ *
  * This file was added by Harri Porten <porten@tu-harburg.de>
  *
  *
@@ -47,7 +47,9 @@ public:
   ~Modem();
 
   const QString getDevice() {return device;};
-  void setDevice(const QString dev) {device = dev;}; 
+  void setDevice(const QString dev) {device = dev;};
+
+  void save();
 
   bool opentty();
   bool closetty();
@@ -56,7 +58,7 @@ public:
   bool writeLine(const char *);
   bool dataMode() const { return data_mode; }
   void setDataMode(bool set) { data_mode = set; }
-  const QString modemMessage();  
+  const QString modemMessage();
   speed_t modemspeed();
   static QString parseModemSpeed(const QString &);
   void notify(const QObject *, const char *);
@@ -73,7 +75,12 @@ public:
   bool execPPPDaemon(const QString & arguments);
   int  openResolv(int flags);
   bool setHostname(const QString & name);
-  
+
+  QString pppDevice()const;
+    void setPPPDevice( const QString& );
+    pid_t pppPID()const;
+    void setPPPDPid( pid_t );
+
 public:
   enum Auth { PAP = 1, CHAP };
   //  static Modem *modem;
@@ -85,7 +92,8 @@ signals:
 private slots:
   void startNotifier();
   void stopNotifier();
-  void readtty(int);  
+  void readtty(int);
+  void slotModemDebug(int);
 
 private:
   enum { MaxPathLen = 30, MaxStrLen = 40, MaxArgs = 100 };
@@ -102,17 +110,20 @@ private:
 
 private:
   QString device;
-  QString lockfile;   
+  QString lockfile;
   int modemfd;
   int pppdPid;
   int _pppdExitStatus;
   QSocketNotifier *sn;
+    QSocketNotifier *m_modemDebug;
   bool data_mode;
   QString errmsg;
   struct termios initial_tty;
   struct termios tty;
   bool modem_is_locked;
   PPPData *_pppdata;
+    int m_pppdLOG[2];
+    QString m_pppdDev;
 };
 
 #endif