summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oglobalsettings.cpp6
-rw-r--r--libopie2/opienet/onetwork.cpp3
-rw-r--r--libopie2/opienet/onetwork.h8
3 files changed, 13 insertions, 4 deletions
diff --git a/libopie2/opiecore/oglobalsettings.cpp b/libopie2/opiecore/oglobalsettings.cpp
index 184ee69..1799529 100644
--- a/libopie2/opiecore/oglobalsettings.cpp
+++ b/libopie2/opiecore/oglobalsettings.cpp
@@ -427,99 +427,99 @@ void OGlobalSettings::initStatic() // should be called initPaths(). Don't put an
s_desktopPath->prepend( QDir::homeDirPath() + "/" );
*s_desktopPath = QDir::cleanDirPath( *s_desktopPath );
if ( s_desktopPath->right(1) != "/")
*s_desktopPath += "/";
// Trash Path
*s_trashPath = *s_desktopPath + QObject::tr("Trash") + "/";
*s_trashPath = config->readEntry( "Trash" , *s_trashPath);
if ( (*s_trashPath)[0] != '/' )
s_trashPath->prepend( QDir::homeDirPath() + "/" );
*s_trashPath = QDir::cleanDirPath( *s_trashPath );
if ( s_trashPath->right(1) != "/")
*s_trashPath += "/";
// We need to save it in any case, in case the language changes later on,
if ( !config->hasKey( "Trash" ) )
{
//config->writePathEntry( "Trash", *s_trashPath, true, true );
config->writeEntry( "Trash", *s_trashPath );
//config->sync();
}
/* // Autostart Path
*s_autostartPath = OGlobal::dirs()->localkdedir() + "Autostart" + "/";
*s_autostartPath = config->readEntry( "Autostart" , *s_autostartPath);
if ( (*s_autostartPath)[0] != '/' )
s_autostartPath->prepend( QDir::homeDirPath() + "/" );
*s_autostartPath = QDir::cleanDirPath( *s_autostartPath );
if ( s_autostartPath->right(1) != "/")
*s_autostartPath += "/";
*/
// Document Path
*s_documentPath = QString::null;
*s_documentPath = config->readEntry( "Documents" , *s_documentPath);
if ( (*s_documentPath)[0] != '/' )
s_documentPath->prepend( QDir::homeDirPath() + "/" );
*s_documentPath = QDir::cleanDirPath( *s_documentPath );
if ( s_documentPath->right(1) != "/")
*s_documentPath += "/";
//config->setDollarExpansion(dollarExpansion);
// Make sure this app gets the notifications about those paths
//if (kapp)
//kapp->addKipcEventMask(KIPC::SettingsChanged);
}
void OGlobalSettings::initColors()
{
- if ( not OpieHighlight ) OpieHighlight = new QColor( 156, 118, 32 );
- if ( not OpieAlternate ) OpieAlternate = new QColor( 238, 246, 255 );
- if ( not OpieGray ) OpieGray = new QColor( 220, 210, 215 );
+ if ( !OpieHighlight ) OpieHighlight = new QColor( 156, 118, 32 );
+ if ( !OpieAlternate ) OpieAlternate = new QColor( 238, 246, 255 );
+ if ( !OpieGray ) OpieGray = new QColor( 220, 210, 215 );
}
void OGlobalSettings::rereadFontSettings()
{
delete _generalFont;
_generalFont = 0L;
delete _fixedFont;
_fixedFont = 0L;
delete _menuFont;
_menuFont = 0L;
delete _toolBarFont;
_toolBarFont = 0L;
delete _windowTitleFont;
_windowTitleFont = 0L;
delete _taskbarFont;
_taskbarFont = 0L;
}
void OGlobalSettings::rereadPathSettings()
{
qDebug( "OGlobalSettings::rereadPathSettings" );
delete s_autostartPath;
s_autostartPath = 0L;
delete s_trashPath;
s_trashPath = 0L;
delete s_desktopPath;
s_desktopPath = 0L;
delete s_documentPath;
s_documentPath = 0L;
}
OGlobalSettings::OMouseSettings & OGlobalSettings::mouseSettings()
{
if ( ! s_mouseSettings )
{
s_mouseSettings = new OMouseSettings;
OMouseSettings & s = *s_mouseSettings; // for convenience
OConfigGroupSaver cgs( OGlobal::config(), "Mouse" );
QString setting = OGlobal::config()->readEntry("MouseButtonMapping");
if (setting == "RightHanded")
s.handed = OMouseSettings::RightHanded;
else if (setting == "LeftHanded")
s.handed = OMouseSettings::LeftHanded;
else
{
// FIXME: Implement for Opie / Qt Embedded
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 25c70e0..998b50e 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -6,96 +6,97 @@
Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
=.
.=l.
           .>+-=
 _;:,     .>    :=|. This program is free software; you can
.> <`_,   >  .   <= redistribute it and/or modify it under
:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
.="- .-=="i,     .._ License as published by the Free Software
 - .   .-<_>     .<> Foundation; either version 2 of the License,
     ._= =}       : or (at your option) any later version.
    .%`+i>       _;_.
    .i_,=:_.      -<s. This program is distributed in the hope that
     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
    : ..    .:,     . . . without even the implied warranty of
    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
..}^=.=       =       ; Library General Public License for more
++=   -.     .`     .: details.
 :     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = Library General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
/* OPIE */
#include <opie2/onetwork.h>
/* QT */
#include <qfile.h>
#include <qtextstream.h>
/* UNIX */
#include <arpa/inet.h>
#include <cerrno>
#include <cstring>
#include <cstdlib>
#include <math.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
+#include <linux/sockios.h>
#include <linux/wireless.h>
using namespace std;
/*======================================================================================
* ONetwork
*======================================================================================*/
ONetwork* ONetwork::_instance = 0;
ONetwork::ONetwork()
{
qDebug( "ONetwork::ONetwork()" );
synchronize();
}
void ONetwork::synchronize()
{
// gather available interfaces by inspecting /proc/net/dev
// we could use SIOCGIFCONF here, but we aren't interested in virtual (e.g. eth0:0) devices
_interfaces.clear();
QString str;
QFile f( "/proc/net/dev" );
bool hasFile = f.open( IO_ReadOnly );
if ( !hasFile )
{
qDebug( "ONetwork: /proc/net/dev not existing. No network devices available" );
return;
}
QTextStream s( &f );
s.readLine();
s.readLine();
while ( !s.atEnd() )
{
s >> str;
str.truncate( str.find( ':' ) );
qDebug( "ONetwork: found interface '%s'", (const char*) str );
ONetworkInterface* iface;
if ( isWirelessInterface( str ) )
{
iface = new OWirelessNetworkInterface( str );
qDebug( "ONetwork: interface '%s' has Wireless Extensions", (const char*) str );
}
else
{
iface = new ONetworkInterface( str );
}
@@ -680,97 +681,97 @@ OWlanNGMonitoringInterface::~OWlanNGMonitoringInterface()
void OWlanNGMonitoringInterface::setEnabled( bool b )
{
//FIXME: do nothing if its already in the same mode
QString enable = b ? "true" : "false";
QString cmd;
cmd.sprintf( "$(which wlanctl-ng) %s lnxreq_wlansniff channel=%d enable=%s", (const char*) _if->name(), 1, (const char*) enable );
system( cmd );
OMonitoringInterface::setEnabled( b );
}
QString OWlanNGMonitoringInterface::name() const
{
return "wlan-ng";
}
void OWlanNGMonitoringInterface::setChannel( int )
{
// wlan-ng devices automatically switch channels when in monitor mode
}
/*======================================================================================
* OHostAPMonitoringInterface
*======================================================================================*/
OHostAPMonitoringInterface::OHostAPMonitoringInterface( ONetworkInterface* iface )
:OMonitoringInterface( iface )
{
iface->setMonitoring( this );
}
OHostAPMonitoringInterface::~OHostAPMonitoringInterface()
{
}
void OHostAPMonitoringInterface::setEnabled( bool b )
{
// IW_MODE_MONITOR was introduced in Wireless Extensions Version 15
// Wireless Extensions < Version 15 need iwpriv commandos for monitoring
#if WIRELESS_EXT > 14
_if->_iwr.u.mode = IW_MODE_MONITOR;
_if->wioctl( SIOCSIWMODE );
#else
- int* args = (int*) &_if._iwr.u.name;
+ int* args = (int*) &_if->_iwr.u.name;
args[0] = 2;
args[1] = 0;
_if->wioctl( SIOCDEVPRIVATE );
#endif
OMonitoringInterface::setEnabled( b );
}
QString OHostAPMonitoringInterface::name() const
{
return "hostap";
}
/*======================================================================================
* OOrinocoNetworkInterface
*======================================================================================*/
OOrinocoMonitoringInterface::OOrinocoMonitoringInterface( ONetworkInterface* iface )
:OMonitoringInterface( iface )
{
iface->setMonitoring( this );
}
OOrinocoMonitoringInterface::~OOrinocoMonitoringInterface()
{
}
void OOrinocoMonitoringInterface::setChannel( int c )
{
// call iwpriv <device> monitor 2 <channel>
int* args = (int*) &_if->_iwr.u.name;
args[0] = 2;
args[1] = c;
_if->wioctl( SIOCIWFIRSTPRIV + 0x8 );
}
void OOrinocoMonitoringInterface::setEnabled( bool b )
{
if ( b )
{
setChannel( 1 );
}
else
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index 936ac85..56da5f4 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -3,100 +3,108 @@
              Copyright (C) 2003 by the Wellenreiter team:
Martin J. Muench <mjm@remote-exploit.org>
Max Moser <mmo@remote-exploit.org
Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
=.
.=l.
           .>+-=
 _;:,     .>    :=|. This program is free software; you can
.> <`_,   >  .   <= redistribute it and/or modify it under
:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
.="- .-=="i,     .._ License as published by the Free Software
 - .   .-<_>     .<> Foundation; either version 2 of the License,
     ._= =}       : or (at your option) any later version.
    .%`+i>       _;_.
    .i_,=:_.      -<s. This program is distributed in the hope that
     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
    : ..    .:,     . . . without even the implied warranty of
    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
..}^=.=       =       ; Library General Public License for more
++=   -.     .`     .: details.
 :     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = Library General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef ONETWORK_H
#define ONETWORK_H
/* QT */
#include <qdict.h>
#include <qmap.h>
#include <qobject.h>
#include <qhostaddress.h>
/* OPIE */
#include <opie2/onetutils.h>
// ML: Yeah, I hate to include kernel headers, but it's necessary here
// ML: Recent RedHat and MandrakePatches to the Kernel and WE broke something
// ML: #include <net/if.h> e.g. conflicts with #include <linux/wireless.h>
+
+#ifndef IFNAMSIZ
#define IFNAMSIZ 16
+#endif
+
#include <linux/wireless.h>
#include <net/if.h>
+#ifndef SIOCIWFIRSTPRIV
+#define SIOCIWFIRSTPRIV SIOCDEVPRIVATE
+#endif
+
class ONetworkInterface;
class OWirelessNetworkInterface;
class OChannelHopper;
class OMonitoringInterface;
typedef struct ifreq ifreqstruct;
typedef struct iwreq iwreqstruct;
typedef struct iw_event iweventstruct;
typedef struct iw_freq iwfreqstruct;
typedef struct iw_priv_args iwprivargsstruct;
typedef struct iw_range iwrangestruct;
/*======================================================================================
* ONetwork
*======================================================================================*/
class ONetwork : public QObject
{
Q_OBJECT
public:
typedef QDict<ONetworkInterface> InterfaceMap;
typedef QDictIterator<ONetworkInterface> InterfaceIterator;
public:
static ONetwork* instance();
InterfaceIterator iterator() const;
bool isWirelessInterface( const char* ) const;
ONetworkInterface* interface( QString ) const;
protected:
ONetwork();
void synchronize();
private:
static ONetwork* _instance;
InterfaceMap _interfaces;
};
/*======================================================================================
* ONetworkInterface
*======================================================================================*/
class ONetworkInterface
{
friend class OMonitoringInterface;
friend class OCiscoMonitoringInterface;