13 files changed, 25 insertions, 25 deletions
diff --git a/noncore/settings/networksettings2/main.cpp b/noncore/settings/networksettings2/main.cpp index 8487e3e..973b4b7 100644 --- a/noncore/settings/networksettings2/main.cpp +++ b/noncore/settings/networksettings2/main.cpp @@ -1,175 +1,163 @@ #include "nsdata.h" #include "activateprofile.h" #include "activatevpn.h" #include "networksettings.h" #include <opie2/odebug.h> #include <qpe/qpeapplication.h> #include <opie2/oapplicationfactory.h> using namespace Opie::Core; #ifdef GONE OPIE_EXPORT_APP( OApplicationFactory<NetworkSettings> ) #else // just standard GUI #define ACT_GUI 0 // used by interfaces to request for allow of up/down #define ACT_REQUEST 1 // regenerate config files #define ACT_REGEN 2 // used by interfaces to request user prompt #define ACT_PROMPT 3 // used by interfaces to trigger VPN #define ACT_VPN 4 // activate opietooth #define ACT_OT 5 // include Opietooth GUI #include <opietooth2/Opietooth.h> using namespace Opietooth2; #include <qpushbutton.h> #include <qlayout.h> #include <qframe.h> #include <qlabel.h> int main( int argc, char * argv[] ) { int rv = 0; int Action = ACT_GUI; // could be overruled by -qws QApplication::Type GuiType = QApplication::GuiClient; -#ifdef _WS_QWS_ QPEApplication * TheApp; -#else - QApplication * TheApp; -#endif for ( int i = 1; i < argc; i ++ ) { int rmv; rmv = 0; if( strcmp( argv[i], "--regen" ) == 0 ) { Action = ACT_REGEN; GuiType = QApplication::Tty; rmv = 1; } else if( strcmp( argv[i], "--prompt" ) == 0 ) { Action = ACT_PROMPT; rmv = 1; } else if( strcmp( argv[i], "--triggervpn" ) == 0 ) { Action = ACT_VPN; rmv = 1; } else if( strcmp( argv[i], "--opietooth" ) == 0 ) { Action = ACT_OT; rmv = 1; } if( rmv ) { memmove( argv+i, argv+i+rmv, sizeof( char * ) * (argc-i-rmv) ); i --; argc -= rmv; } } if( strstr( argv[0], "-request" ) ) { // called from system to request something GuiType = QApplication::Tty; Action = ACT_REQUEST; Log(("Request : %s\n", argv[1] )); } else if( strstr( argv[0], "-opietooth" ) ) { Action = ACT_OT; } // Start Qt -#ifdef _WS_QWS_ // because QPEApplication does not handle GuiType well if( GuiType == QApplication::Tty ) { // this cast is NOT correct but we do not use // TheApp anymore ... TheApp = (QPEApplication *)new QApplication( argc, argv, GuiType ); } else { TheApp = new QPEApplication( argc, argv, GuiType ); } -#else - TheApp = new QApplication( argc, argv, GuiType ); -#endif // init qt with app widget switch( Action ) { case ACT_REQUEST : { NetworkSettingsData NS; if( NS.canStart( argv[1] ) ) { QStringList S; S << QPEApplication::qpeDir() + "/bin/networksettings2"; S << "networksettings2"; S << "--prompt"; S << argv[1]; NSResources->system().execAsUser( S ); Log(("FAILED %s-cNN-allowed\n", argv[1] )); // if we come here , failed printf( "%s-cNN-disallowed", argv[1] ); } } break; case ACT_REGEN : { NetworkSettingsData NS; QString S= NS.generateSettings(); // regen returns 0 if OK rv = ( S.isEmpty() ) ? 0 : 1; } break; case ACT_PROMPT : { ActivateProfile AP(argv[1]); if( AP.exec() == QDialog::Accepted ) { Log(("%s-c%ld-allowed\n", argv[1], AP.selectedProfile() )); printf( "%s-c%ld-allowed", argv[1], AP.selectedProfile() ); } else { Log(("%s-c%NN-disallowed\n", argv[1] )); printf( "%s-cNN-disallowed", argv[1] ); } } break; case ACT_VPN : { ActivateVPN AVPN; AVPN.exec(); } break; case ACT_GUI : case ACT_OT : { QWidget * W; if( Action == ACT_OT ) { W = new OTMain( 0 ); } else { W = new NetworkSettings(0); } TheApp->setMainWidget( W ); W->show(); -#ifdef _WS_QWS_ W->showMaximized(); -#else - W->resize( W->sizeHint() ); -#endif rv = TheApp->exec(); delete W; } break; } LogClose(); return rv; } #endif // main.cpp diff --git a/noncore/settings/networksettings2/networksettings2/systemfile.cpp b/noncore/settings/networksettings2/networksettings2/systemfile.cpp index 82fd43a..8deef94 100644 --- a/noncore/settings/networksettings2/networksettings2/systemfile.cpp +++ b/noncore/settings/networksettings2/networksettings2/systemfile.cpp @@ -1,59 +1,59 @@ #include <stdio.h> #include <qpe/qpeapplication.h> #include <qfileinfo.h> #include <qmessagebox.h> #include <qfile.h> #include <qtextstream.h> #include "resources.h" #include "systemfile.h" -#define TEMPLATEDIR "networktemplates/" +#define TEMPLATEDIR "NS2templates/" QString TemplDir; SystemFile::SystemFile( const QString & N, const QString & P, bool KDI ){ Name = N; Path = P; InAppend = 0; F = 0; // get template info { QString S; QFileInfo FI; // find location of templates TemplDir = QPEApplication::qpeDir() + "etc/" + TEMPLATEDIR; FI.setFile( TemplDir ); if( ! FI.isDir() ) { // try current dir TemplDir = "./" TEMPLATEDIR; FI.setFile( TemplDir ); if( ! FI.isDir() ) { hasPreSection = hasPostSection = hasPreNodeSection = hasPostNodeSection = hasPreDeviceSection = hasPostDeviceSection = 0; return; } } // have found location S = TemplDir + Name + "/presection"; FI.setFile( S ); hasPreSection = ( FI.exists() && FI.isReadable() ); S = TemplDir + Name + "/postsection"; FI.setFile( S ); hasPostSection = ( FI.exists() && FI.isReadable() ); S = TemplDir + Name + "/prenodesection"; FI.setFile( S ); hasPreNodeSection = ( FI.exists() && FI.isReadable() ); S = TemplDir + Name + "/postnodesection"; FI.setFile( S ); hasPostNodeSection = ( FI.exists() && FI.isReadable() ); S = TemplDir + Name + "/predevicesection"; FI.setFile( S ); hasPreDeviceSection = ( FI.exists() && FI.isReadable() ); S = TemplDir + Name + "/postdevicesection"; diff --git a/noncore/settings/networksettings2/opie-networksettings2.control b/noncore/settings/networksettings2/opie-networksettings2.control index 874833c..a79a740 100644 --- a/noncore/settings/networksettings2/opie-networksettings2.control +++ b/noncore/settings/networksettings2/opie-networksettings2.control @@ -1,10 +1,10 @@ Package: opie-networksettings2 -Files: bin/networksettings2 apps/Settings/networksettings2.desktop pics/networksettings2/*.png lib/libnetworksettings2.so* pics/networksettings2/Devices/*.png etc/NS2templates/* etc/NS2templates/*/* +Files: bin/networksettings2 apps/Settings/networksettings2.desktop pics/networksettings2/*.png lib/libnetworksettings2.so* pics/networksettings2/Devices/*.png etc/NS2templates/* etc/NS2templates/*/* bin/NS2SetMac.sh Priority: optional Section: opie/settings Maintainer: wim delvaux <wimpie@handhelds.org> Architecture: arm Depends: task-opie-minimal, libopietooth2 Description: Network settings. Replaces: opie-networksetup Version: $QPE_VERSION$EXTRAVERSION diff --git a/noncore/settings/networksettings2/opietooth2/OTDevice.h b/noncore/settings/networksettings2/opietooth2/OTDevice.h index c2abb09..cf1c4b6 100644 --- a/noncore/settings/networksettings2/opietooth2/OTDevice.h +++ b/noncore/settings/networksettings2/opietooth2/OTDevice.h @@ -1,68 +1,68 @@ #ifndef OTDEVICE_H #define OTDEVICE_H #include <qobject.h> #include <qstring.h> #include <bluezlib.h> #include <OTGateway.h> // define if you want to use the process hciattach for detection // #define USEHCIPROC class QTimerEvent; namespace Opie { namespace Core { class OProcess; - } -} + }; +}; namespace Opietooth2 { /** * Device takes care of attaching serial * devices to the blueZ stack. * After attaching it hciconfig ups it */ class OTDevice : public QObject { Q_OBJECT public: /** * Brings up the device. * will detech which device is needed * Usage example: new Device(/dev/ttySB0, csr) * */ OTDevice( OTGateway * _OT ); /** * unloads the device */ ~OTDevice(); inline OTGateway * gateway() const { return OT; } inline bool needsAttach( void ) const { return NeedsAttach; } inline int deviceNr() const { return m_deviceNr; } /** * attach the device * @return bool which is TRUE if command started sucessfully */ bool attach(); /** * detach the device * @return bool which is TRUE if command started sucessfully */ bool detach(); diff --git a/noncore/settings/networksettings2/opietooth2/OTDeviceAddress.h b/noncore/settings/networksettings2/opietooth2/OTDeviceAddress.h index 8395f37..50f28fc 100644 --- a/noncore/settings/networksettings2/opietooth2/OTDeviceAddress.h +++ b/noncore/settings/networksettings2/opietooth2/OTDeviceAddress.h @@ -58,51 +58,51 @@ public: /** Converts the DeviceAddress into a BlueZ bdaddr_t. @param networkbyteorder if true, the address is returned in network byte order. @return the address as bdaddr_t */ inline const bdaddr_t & getBDAddr( void ) const { return BDaddr; } bdaddr_t getBDAddrInNetworkByteOrder() const; void setBDAddr( const bdaddr_t& bdaddr, bool networkbyteorder = false ); /** Less-than-operator. Mainly there to use DeviceAddress inside STL containers, like STL sets or as a key in a STL map. @param b the DeviceAddress to compare to (right hand side) @return true if this < b, false otherwise. */ bool operator<(const OTDeviceAddress& b) const; /** Equality operator. Tests two device addresses for equality. @param b the DeviceAddress to compare to (right hand side) @return true if this and b have the same address or if both are invalid, false otherwise */ bool operator==(const OTDeviceAddress& b) const; inline bool operator!=(const OTDeviceAddress& b) const { return ! ( *this == b ); } /** The address 00:00:00:FF:FF:FF */ static const OTDeviceAddress local; /** The address 00:00:00:00:00:00 */ static const OTDeviceAddress any; /** An address tagged as invalid */ static const OTDeviceAddress invalid; protected: bdaddr_t BDaddr; bool IsValid; }; -} +}; #endif diff --git a/noncore/settings/networksettings2/opietooth2/OTDriver.h b/noncore/settings/networksettings2/opietooth2/OTDriver.h index b54ffdf..f249cf7 100644 --- a/noncore/settings/networksettings2/opietooth2/OTDriver.h +++ b/noncore/settings/networksettings2/opietooth2/OTDriver.h @@ -183,50 +183,50 @@ public: void changeClass( unsigned char service, unsigned char major, unsigned char minor); QString getPeerName( const OTDeviceAddress & PAddr ); // address must be connected to this driver long getLinkQuality( const OTDeviceAddress & Address ); signals : void error( const QString & ); void stateChange( OTDriver * , bool ); void driverDisappeared( OTDriver * ); private slots : /* * Reinitializes the device, obtaining a fresh * hci_dev_info structure. */ void reinit(); void SLOT_CloseFd(); private: QString getRevEricsson(); QString getRevCsr(unsigned short rev); QString Name; QString Dev; QString Revision; QString Manufacturer; OTDeviceAddress Address; QString Features; QTimer * AutoClose; int Dev_id,Fd,Type; bool IsUp; int Iscan,Pscan,Auth,Encrypt; // socket bound to this device OTHCISocket * Socket; // backpointer to opietooth system OTGateway * OT; }; -} +}; #endif diff --git a/noncore/settings/networksettings2/opietooth2/OTIcons.h b/noncore/settings/networksettings2/opietooth2/OTIcons.h index ee10831..966ed24 100644 --- a/noncore/settings/networksettings2/opietooth2/OTIcons.h +++ b/noncore/settings/networksettings2/opietooth2/OTIcons.h @@ -4,51 +4,51 @@ #include <OTUUID.h> #include <qpixmap.h> #include <qmap.h> namespace Opietooth2 { class OTIcons { public: OTIcons(); ~OTIcons(); /** * Returns an icon depending on device class * @param deviceClass the device class name * @return the pixmap */ QPixmap deviceIcon( const QString & ); /** * Returns an icon depending on service id * @param serviceClass the service id * @return the pixmap * @return true if found */ QPixmap serviceIcon( int, bool & ); // returns all UUID that represent channels with modem function const UUIDVector & modems() { return Modems; } // returns all UUID that represent channels with network const UUIDVector & network() { return Networks; } // set Sub to find icons in .../Icons dir QPixmap loadPixmap( const QString &, bool Sub = 0 ); private: // first ist id, second is icon name QMap<QString,QString> deviceIcons; QMap<int,QString> serviceIcons; UUIDVector Modems; UUIDVector Networks; }; -} +}; #endif diff --git a/noncore/settings/networksettings2/opietooth2/OTInquiry.h b/noncore/settings/networksettings2/opietooth2/OTInquiry.h index f7bdeec..2682499 100644 --- a/noncore/settings/networksettings2/opietooth2/OTInquiry.h +++ b/noncore/settings/networksettings2/opietooth2/OTInquiry.h @@ -129,50 +129,50 @@ protected: */ virtual void onPeerFound( OTPeer * Peer, bool ); enum ErrorCode { InquiryFinishedTimeout = 0x0100 }; signals : void peerFound( OTPeer *, bool ); /** Emitted after an inquiry has finished successfully. If the inquiry was canceled, no finished signals is emitted. This signal can be emitted without having called inquiry, since other processes may have started an inquiry. */ void finished(); /** Emitted instead of finished if an error occured after calling inquiry() or periodicInquiryMode() @param code error code. @param message Error message */ void error( QString message ); private: // std::set<DeviceAddress> addrCache; // double currentTimeout; // QByteArray* buf; // QSocket* hciSocket; QGuardedPtr<OTHCISocket> Socket; OTDriver * Driver; //QDateTime *startTime; QTimer *InquiryTimeoutTimer; // std::deque<InquiryInfo> infoQueue; bool SuccessfullyStarted; bool SuccessfullyEnded; private slots: void slotInquiryTimeout(); void slotHCIEvent(unsigned char eventCode, QByteArray buf); }; -} +}; #endif diff --git a/noncore/settings/networksettings2/opietooth2/OTPeer.h b/noncore/settings/networksettings2/opietooth2/OTPeer.h index c09af15..9cd0dc7 100644 --- a/noncore/settings/networksettings2/opietooth2/OTPeer.h +++ b/noncore/settings/networksettings2/opietooth2/OTPeer.h @@ -85,51 +85,51 @@ public : { State = S; } inline PeerState_t state( void ) { return State; } // go and find out state // will report back with signal void findOutState( int timeoutInSec = 1, bool Force = 0 ); void stopFindingOutState( void ); // return driver to which this peer is connected to // if it is connected inline OTDriver * connectedTo( void ) const { return ConnectedTo; } inline void setConnectedTo( OTDriver * D ) { ConnectedTo = D; } void save( QTextStream& TS ); void load( QTextStream& TS ); signals : // report back state void peerStateReport( OTPeer *); void error( const QString & ); protected : // while polling for result of ping void timerEvent( QTimerEvent * ev ); private: void updateServices(); OTGateway * OT; OTDeviceAddress Addr; QString Name; int Class; ServiceVector serviceList; // -1 : don't know, 0 no, 1 yes PeerState_t State; OTDriver * ConnectedTo; int ProbeFD; int ProbePhase; // see OTDriver long ProbeTimeout; }; -} +}; #endif diff --git a/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.h b/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.h index e79e33d..86b5623 100644 --- a/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.h +++ b/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.h @@ -90,51 +90,51 @@ public: OTSDPAttribute(); OTSDPAttribute( sdp_data_t * D ); ~OTSDPAttribute(); QString toString( void ); void setNil(); void setInt(const OTSDPAttribute::int128_t & val); void setUInt(const OTSDPAttribute::uint128_t & val); void setUUID( const OTUUID & val); void setBool(bool val); void setString(const QString & val); void setURL(const QString & val); void setSequence(const AttributeVector& val); void setAlternative(const AttributeVector& val); QString getString(); QString getURL(); const OTSDPAttribute::int128_t & getInt(); const OTSDPAttribute::uint128_t & getUInt(); const OTUUID & getUUID(); bool getBool(); AttributeVector * getSequence(); AttributeVector * getAlternative(); UUIDVector getAllUUIDs(); inline AttrType getType() { return type; } //QString getValString(); const char * getTypeString(); private: AttrType type; union { OTSDPAttribute::int128_t * intVal; OTSDPAttribute::uint128_t * uintVal; OTUUID * uuidVal; bool boolVal; QString * stringVal; // strings and urls AttributeVector * sequenceVal; // sequences and alternatives } Value; }; -} +}; #endif diff --git a/noncore/settings/networksettings2/opietooth2/OTSDPService.h b/noncore/settings/networksettings2/opietooth2/OTSDPService.h index 4831df0..21d7344 100644 --- a/noncore/settings/networksettings2/opietooth2/OTSDPService.h +++ b/noncore/settings/networksettings2/opietooth2/OTSDPService.h @@ -25,51 +25,51 @@ class OTSDPService { public: OTSDPService(); virtual ~OTSDPService(); void addAttribute(int id, OTSDPAttribute * attr); const OTSDPAttribute & attribute( int index ); int attributeID( int index ); AttributeVector subAttributes( OTSDPAttribute * attr); OTSDPAttribute * attributeByID( int id ); // See Bluetooth Core Spec Sec. 5.1 bool recordHandle(uint32_t *handle); // 0x00 //bool getServiceClassIDList(vector<uuid_t> *classIDList); // 0x01 //bool getServiceRecordState(uint32_t *state); // 0x02 //bool getServiceID(uuid_t *id); // 0x03; //bool getProtocolDescriptorList(SDP::Attribute *attribute); // 0x04 //bool getBrowseGroupList(vector<uuid_t> *browseGroupList); // 0x05 QString name(void); // langBase + 0x00 QString description(void); // langBase + 0x01 UUIDVector allUUIDs(); // return list of classes this service belongs to UUIDVector classIDList(); /** Retrieves the Rfcomm channel. This function is provided just for conveniance. @param n The Rfcomm channel. @ret true if an rfcomm channel was found, false otherwise. */ bool rfcommChannel(unsigned int &n); bool hasClassID(const OTUUID & uuid); private: struct AttributeEntry { int id; OTSDPAttribute * attr; }; QArray<AttributeEntry> attributeList; }; -} +}; #endif diff --git a/noncore/settings/networksettings2/opietooth2/OTUUID.h b/noncore/settings/networksettings2/opietooth2/OTUUID.h index aebd9b9..97df114 100644 --- a/noncore/settings/networksettings2/opietooth2/OTUUID.h +++ b/noncore/settings/networksettings2/opietooth2/OTUUID.h @@ -9,50 +9,50 @@ * (at your option) any later version. * ***************************************************************************/ #ifndef OTUUID_H #define OTUUID_H #include <qstring.h> #include <qarray.h> #include <bluezlib.h> namespace Opietooth2 { class OTUUID; typedef QArray<OTUUID> UUIDVector; class OTUUID { public : OTUUID( QString s ); OTUUID( uint64_t l=0, uint64_t h=0); OTUUID( const OTUUID & O ); bool fromString(QString s); void setUUID128(uint64_t hi, uint64_t lo); void setUUID32(uint32_t v); uint16_t toShort() { return ((hi>>32) & 0xffff); } uint32_t toLong() { return ((hi>>32) & 0xffffffff); } uint64_t toLongLong() { return hi; } QString toString() const ; operator QString() const; operator ::uuid_t() const; OTUUID & operator=( const OTUUID & other ) ; bool operator<( const OTUUID & other ) const; bool operator==(const OTUUID & uuid) const; uint64_t hi; uint64_t lo; }; -} +}; #endif diff --git a/noncore/settings/networksettings2/usb/usbrun.cpp b/noncore/settings/networksettings2/usb/usbrun.cpp index f8824e0..0a46642 100644 --- a/noncore/settings/networksettings2/usb/usbrun.cpp +++ b/noncore/settings/networksettings2/usb/usbrun.cpp @@ -26,87 +26,99 @@ State_t USBRun::detectState( void ) { for( QDictIterator<InterfaceInfo> It(Sys.interfaces()); It.current(); ++It ) { Run = It.current(); if( X == Run->Name ) { NC->assignInterface( Run ); return IsUp; } } } } Log(("Assigned %p\n", NC->assignedInterface() )); if( ( Run = NC->assignedInterface() ) ) { // we already have an interface assigned -> still present ? if( ! Run->IsUp ) { // usb is still free -> keep assignment return Available; } // else interface is up but NOT us -> some other profile } // nothing (valid) assigned to us NC->assignInterface( 0 ); // find possible interface for( QDictIterator<InterfaceInfo> It(Sys.interfaces()); It.current(); ++It ) { Run = It.current(); Log(("%s %d %d=%d %d\n", Run->Name.latin1(), handlesInterface( Run->Name ), Run->CardType, ARPHRD_ETHER, ! Run->IsUp )); if( handlesInterface( Run->Name ) && Run->CardType == ARPHRD_ETHER && ! Run->IsUp ) { // proper type, and Not UP -> free return Off; } } return Unavailable; } -QString USBRun::setMyState( NodeCollection *, Action_t , bool ) { +QString USBRun::setMyState( NodeCollection * NC, Action_t A, bool ) { + + // nothing needs to be done to 'activate' or 'deactivate' + // a cable + + // perhaps (later) we can figure out if the device is IN the + // cradle + if( A == Activate ) { + NC->setCurrentState( Available ); + } else if ( A == Deactivate ) { + NC->setCurrentState( Unavailable ); + } + return QString(); } // get interface that is free or assigned to us InterfaceInfo * USBRun::getInterface( void ) { System & S = NSResources->system(); InterfaceInfo * best = 0, * Run; QRegExp R( "usb[0-9abcdef]" ); for( QDictIterator<InterfaceInfo> It(S.interfaces()); It.current(); ++It ) { Run = It.current(); if( handlesInterface( Run->Name ) && Run->CardType == ARPHRD_ETHER ) { // this is a USB card if( Run->assignedConnection() == netNode()->connection() ) { // assigned to us return Run; } else if( Run->assignedConnection() == 0 ) { // free best = Run; } } } return best; // can be 0 } bool USBRun::handlesInterface( const QString & S ) { return Pat.match( S ) >= 0; } bool USBRun::handlesInterface( InterfaceInfo * I ) { return handlesInterface( I->Name ); } |