[patch] chestnut-dialer-0.3.3-ifconfig.patch

chestnut-dialer-0.3.3-ifconfig.patch (text/plain), 1.65 KB, created by Vladimir on 2013-01-14 01:59:26 UTC

diff -Nuar chestnut-dialer-0.3.3.orig/chestnut_dialer/connection.py chestnut-dialer-0.3.3/chestnut_dialer/connection.py
--- chestnut-dialer-0.3.3.orig/chestnut_dialer/connection.py	2007-02-20 10:34:16.000000000 +0200
+++ chestnut-dialer-0.3.3/chestnut_dialer/connection.py	2013-01-14 01:18:19.000000000 +0200
@@ -157,14 +157,12 @@
     r'(authentication failed|Invalid Login|Login incorrect)', re.I)
   
   _ifconfig_info_re = [
-    re.compile(r'^\s*inet addr:(?P<local_ip>\d+\.\d+\.\d+\.\d+)\s+' +
-      r'P-t-P:(?P<remote_ip>\d+\.\d+\.\d+\.\d+)\s+' +
-      r'Mask:(?P<netmask>\d+\.\d+\.\d+\.\d+)', re.M | re.I),
-    re.compile(r'^\s*RX (?P<rx>packets.*)$', re.M),
-    re.compile(r'^\s*TX (?P<tx>packets.*)$', re.M),
-    re.compile(r'^\s*RX bytes:(?P<rx_bytes>\d+ \(.*?\))\s+' +
-      r'TX bytes:(?P<tx_bytes>\d+ \(.*?\))', re.M | re.I)]
-    
+    re.compile(r'^\s*inet (?P<local_ip>\d+\.\d+\.\d+\.\d+)\s+' +
+      r'netmask (?P<netmask>\d+\.\d+\.\d+\.\d+)\s+' +
+      r'destination (?P<remote_ip>\d+\.\d+\.\d+\.\d+)\s+' , re.M | re.I),
+    re.compile(r'^\s*RX packets (?P<rx>\d+)  bytes (?P<rx_bytes>\d+ \(.*?\))$', re.M | re.I),
+    re.compile(r'^\s*TX packets (?P<tx>\d+)  bytes (?P<tx_bytes>\d+ \(.*?\))$', re.M | re.I)]
+
   def __init__(self, account, text_queue,
       pppd_cbcp_with_auto_answer = 0,
       write_dns_to_resolv_conf = 1):
@@ -434,7 +432,7 @@
             if m: 
 	      self.linkname = m.group(1)
 	      continue
-      if self.linkname and re.search(r'^[ \t]+UP',
+      if self.linkname and re.search(r'<UP',
 	  commands.getoutput(
 	    "%s %s 2> /dev/null" % (chestnut_dialer.config.ifconfig, self.linkname)), re.M):
 	self._interface_up = 1