author | kergoth <kergoth> | 2003-08-09 17:14:54 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 17:14:54 (UTC) |
commit | a7e015198a8c5ad3b6e144a9032b059086253e00 (patch) (side-by-side diff) | |
tree | b712b6f11310d88744fe393a92b3160b741a7efe /noncore/settings/networksettings/ppp/modem.h | |
parent | beba0e73306815337bf04dee39502233595e9739 (diff) | |
download | opie-a7e015198a8c5ad3b6e144a9032b059086253e00.zip opie-a7e015198a8c5ad3b6e144a9032b059086253e00.tar.gz opie-a7e015198a8c5ad3b6e144a9032b059086253e00.tar.bz2 |
Merge from BRANCH_1_0
Diffstat (limited to 'noncore/settings/networksettings/ppp/modem.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/ppp/modem.h | 23 |
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 @@ -2,13 +2,13 @@ * kPPP: A pppd Front End for the KDE project * * $Id$ * * Copyright (C) 1997 Bernd Johannes Wuebben * wuebben@math.cornell.edu - * + * * This file was added by Harri Porten <porten@tu-harburg.de> * * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either @@ -44,22 +44,24 @@ class Modem : public QObject { Q_OBJECT public: Modem(PPPData*); ~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(); bool hangup(); bool writeChar(unsigned char); 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 *); void stop(); void flush(); @@ -70,25 +72,31 @@ public: bool removeSecret(int); void killPPPDaemon(); int pppdExitStatus(); 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; int lastStatus; signals: void charWaiting(unsigned char); private slots: void startNotifier(); void stopNotifier(); - void readtty(int); + void readtty(int); + void slotModemDebug(int); private: enum { MaxPathLen = 30, MaxStrLen = 40, MaxArgs = 100 }; enum { Original=0x100, New=0x200, Old=0x400 } Version; const char* authFile(Auth method, int version = Original ); @@ -99,22 +107,25 @@ private: void parseargs(char* buf, char** args); void escape_to_command_mode(); int openLockfile(QString,int); 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 |