[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    solid networkmanager-0.6 backend and wireless connection with no
From:       "Junling Ma" <junlingm () gmail ! com>
Date:       2008-02-11 7:27:04
Message-ID: 6e9d11850802102327l4e6be8a3v86b3b89bf48887ca () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


Hi all,

the following patch allows the solid networkmanager-0.6 backend to accept
wireless connections with no authentication methods. Hope I did not
break anything with authentication.

Junling Ma

[Attachment #5 (text/html)]

Hi all,<br><br>the following patch allows the solid networkmanager-0.6 backend to \
accept wireless connections with no authentication methods. Hope I did not <br>break \
anything with authentication.<br><br>Junling Ma<br><br>


["solid_wireless_cipher_none.patch" (text/x-patch)]

Index: workspace/kcontrol/kthememanager/ktheme.cpp
===================================================================
--- workspace/kcontrol/kthememanager/ktheme.cpp	(revision 773096)
+++ workspace/kcontrol/kthememanager/ktheme.cpp	(working copy)
@@ -17,6 +17,7 @@
 */
 
 #include "ktheme.h"
+#include <kicontheme.h>
 
 #include <QFile>
 #include <QFileInfo>
Index: workspace/solid/networkmanager-0.6/NetworkManager-dbushelper.cpp
===================================================================
--- workspace/solid/networkmanager-0.6/NetworkManager-dbushelper.cpp	(revision \
                773096)
+++ workspace/solid/networkmanager-0.6/NetworkManager-dbushelper.cpp	(working copy)
@@ -27,8 +27,8 @@
 #define IW_AUTH_WPA_VERSION_WPA2        0x00000004
 #define IW_AUTH_KEY_MGMT_802_1X 1
 #define IW_AUTH_KEY_MGMT_PSK    2
+#define IW_AUTH_CIPHER_NONE 0x00000001
 
-
 #include <NetworkManager/NetworkManager.h>
 #include <NetworkManager/cipher.h>
 #include <NetworkManager/cipher-wep-ascii.h>
@@ -47,11 +47,13 @@
 {
     if (auth)
     {
-
-        Solid::Control::AuthenticationWep * wep = \
                dynamic_cast<Solid::Control::AuthenticationWep *>(auth) ;
-        if (wep)
-            return doSerialize(wep, essid, args, error);
-        Solid::Control::AuthenticationWpaPersonal * wpap = \
dynamic_cast<Solid::Control::AuthenticationWpaPersonal *>(auth) ; \
+	Solid::Control::AuthenticationNone * none = \
dynamic_cast<Solid::Control::AuthenticationNone *>(auth) ; +	if (none)
+	    return doSerialize(none, essid, args, error);
+	Solid::Control::AuthenticationWep * wep = \
dynamic_cast<Solid::Control::AuthenticationWep *>(auth) ; +	if (wep)
+	    return doSerialize(wep, essid, args, error);
+	Solid::Control::AuthenticationWpaPersonal * wpap = \
dynamic_cast<Solid::Control::AuthenticationWpaPersonal *>(auth) ;  if (wpap)
             return doSerialize(wpap, essid, args, error);
         Solid::Control::AuthenticationWpaEnterprise * wpae = \
dynamic_cast<Solid::Control::AuthenticationWpaEnterprise *>(auth); @@ -62,6 +64,13 @@
     return QList<QVariant>();
 }
 
+QList<QVariant> NMDBusHelper::doSerialize(Solid::Control::AuthenticationNone * none, \
const QString  & essid, QList<QVariant>  & args, bool * error) +{
+    *error = false;
+    args << QVariant(IW_AUTH_CIPHER_NONE);
+    return args;
+}
+
 QList<QVariant> NMDBusHelper::doSerialize(Solid::Control::AuthenticationWep * auth, \
const QString  & essid, QList<QVariant>  & args, bool * error)  {
     // get correct cipher
Index: workspace/solid/networkmanager-0.6/NetworkManager-dbushelper.h
===================================================================
--- workspace/solid/networkmanager-0.6/NetworkManager-dbushelper.h	(revision 773096)
+++ workspace/solid/networkmanager-0.6/NetworkManager-dbushelper.h	(working copy)
@@ -33,6 +33,7 @@
 public:
     static QList<QVariant> serialize(Solid::Control::Authentication *, const QString \
& essid, QList<QVariant>  & args, bool * error);  private:
+    static QList<QVariant> doSerialize(Solid::Control::AuthenticationNone *, const \
                QString  & essid, QList<QVariant>  & args, bool * error);
     static QList<QVariant> doSerialize(Solid::Control::AuthenticationWep *, const \
                QString  & essid, QList<QVariant>  & args, bool * error);
     static QList<QVariant> doSerialize(Solid::Control::AuthenticationWpaPersonal *, \
                const QString  & essid, QList<QVariant>  & args, bool * error);
     static QList<QVariant> doSerialize(Solid::Control::AuthenticationWpaEnterprise \
                *, const QString  & essid, QList<QVariant>  & args, bool * error);
Index: workspace/solid/networkmanager-0.6/NetworkManager-wirelessnetwork.cpp
===================================================================
--- workspace/solid/networkmanager-0.6/NetworkManager-wirelessnetwork.cpp	(revision \
                773096)
+++ workspace/solid/networkmanager-0.6/NetworkManager-wirelessnetwork.cpp	(working \
copy) @@ -261,7 +261,7 @@
     QDBusObjectPath op(devicePath);
 #warning fixme hardcoded false fallback bool in setActiveDevice
     QList<QVariant> args;
-    args << qVariantFromValue(op) << d->essid << false;
+    args << qVariantFromValue(op) << d->essid; //<< false;
     bool error;
     args = NMDBusHelper::serialize(d->authentication, d->essid, args, &error);
     kDebug(1441) << " " << args;



>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<


[prev in list] [next in list] [prev in thread] [next in thread]