gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-20 04:48:00 +01:00
Code Issues Projects Releases Wiki Activity

Fixed a static DNS bug and added some comments / fixed some typos

Browse Source
This commit is contained in:
imdano
2007-07-08 10:31:48 +00:00
parent f3535a7a65
commit bd9cb2457b
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
networking.py
View File

@@ -234,7 +234,7 @@ class Wireless:
self.lock.acquire() self.lock.acquire()
self.ConnectingMessage = 'interface_down' self.ConnectingMessage = 'interface_down'
self.lock.release() self.lock.release()
#misc.Run("ifconfig " + self.wireless_interface + " down") misc.Run("ifconfig " + self.wireless_interface + " down")
#set a false ip so that when we set the real one, the correct #set a false ip so that when we set the real one, the correct
#routing entry is created #routing entry is created
@@ -314,19 +314,19 @@ class Wireless:
misc.Run("ifconfig " + self.wireless_interface + " broadcast " + network["broadcast"]) misc.Run("ifconfig " + self.wireless_interface + " broadcast " + network["broadcast"])
if not network.get('dns1') == None: if not network.get("dns1") == None:
self.lock.acquire() self.lock.acquire()
self.ConnectingMessage = 'setting_static_dns' self.ConnectingMessage = 'setting_static_dns'
self.lock.release() self.lock.release()
# dns1) print "setting the first dns server...", network["dns1"]
print "setting the first and second dns servers..."
resolv = open("/etc/resolv.conf","w") resolv = open("/etc/resolv.conf","w")
misc.WriteLine(resolv,"nameserver " + network["dns1"]) misc.WriteLine(resolv,"nameserver " + network["dns1"])
if not network.get("dns2") == None:
print "setting the second dns server...", network["dns2"]
misc.WriteLine(resolv,"nameserver " + network["dns2"]) misc.WriteLine(resolv,"nameserver " + network["dns2"])
if not network["dns3"] == None: if not network.get("dns3") == None:
print "setting the third dns server..." print "setting the third dns server..."
misc.WriteLine(resolv,"nameserver " + network["dns3"]) misc.WriteLine(resolv,"nameserver " + network["dns3"]))
if not network.get('ip') == None: if not network.get('ip') == None:
self.lock.acquire() self.lock.acquire()
@@ -366,7 +366,7 @@ class Wireless:
output = misc.Run("iwconfig " + self.wireless_interface) output = misc.Run("iwconfig " + self.wireless_interface)
strength_pattern = re.compile('.*Quality:?=? ?(\d+)',re.DOTALL | re.I | re.M | re.S) strength_pattern = re.compile('.*Quality:?=? ?(\d+)',re.DOTALL | re.I | re.M | re.S)
return misc.RunRegex(strength_pattern,output) return misc.RunRegex(strength_pattern,output)
#end function GetSignalStrength#end function GetSignalStrength #end function GetSignalStrength
def GetCurrentNetwork(self): def GetCurrentNetwork(self):
output = misc.Run("iwconfig " + self.wireless_interface) output = misc.Run("iwconfig " + self.wireless_interface)
@@ -378,8 +378,9 @@ class Wireless:
output = misc.Run("ifconfig " + self.wireless_interface) output = misc.Run("ifconfig " + self.wireless_interface)
ip_pattern = re.compile(r'inet [Aa]d?dr[^.]*:([^.]*\.[^.]*\.[^.]*\.[0-9]*)',re.S) ip_pattern = re.compile(r'inet [Aa]d?dr[^.]*:([^.]*\.[^.]*\.[^.]*\.[0-9]*)',re.S)
return misc.RunRegex(ip_pattern,output) return misc.RunRegex(ip_pattern,output)
#end function GetIP
def CreateAdHocNetwork(self,essid,channel,ip,enctype,key,encused,ics): def CreateAdHocNetwork(self,essid,channel,ip,enctype,key,encused):
misc.Run("killall dhclient dhclient3 wpa_supplicant") #remove wpa_supplicant, as it can cause the connection to revert to misc.Run("killall dhclient dhclient3 wpa_supplicant") #remove wpa_supplicant, as it can cause the connection to revert to
#previous networks... #previous networks...
misc.Run('ifconfig ' + self.wireless_interface + ' down') misc.Run('ifconfig ' + self.wireless_interface + ' down')