Added changedns

4 files changed, 230 insertions, 8 deletions

diff --git a/noncore/net/networksetup/interfaces/changedns b/noncore/net/networksetup/interfaces/changedns
new file mode 100644
index 0000000..4760a67
--- a/dev/null
+++ b/noncore/net/networksetup/interfaces/changedns
@@ -0,0 +1,111 @@
+#!/bin/bash
+
+        SN="`basename $0`"# base portion of our filename
+        AE="-a"                 # switch to add an entry
+        RE="-r"                 # swithc to remove an entry
+        EL="/tmp/resolv.conf"# expected location of the system nameserver config file
+        ARGS="$@"       # friendly variable name for all args
+
+usage(){
+        echo "usage:
+$SN -a {ip} [{ip}...]
+$SN -r {ip} [{ip}...]"
+}
+
+#if are there at least two arguments?
+if [ "$#" -gt 1 ]
+then
+
+        #remove any old resolv.conf file
+        rm .resolve.conf .resolve.old .resolve.new 2> /dev/null
+                        
+        #cast current nameserver file into OLD
+        cat "$EL" > .resolve.old
+
+        #build IP list
+        for ARG in $ARGS
+        do
+                if [ "$ARG" != "$1" ]
+                then
+                        IP_LIST=`echo "$IP_LIST $ARG"`
+                fi
+        done
+
+        #select case on first switch
+        case "$1" in
+
+                #case '-a'
+                        "$AE")
+
+                        #for each IP in IP_LIST
+                        for IP in $IP_LIST
+                        do
+                                #add nameserver entery to .newfile
+                                echo "nameserver $IP" >> .resolve.conf
+
+                                #cat OLD into grep excluding IP lines,
+                                #storing results into NEW
+                                cat .resolve.old | grep -v "$IP" > .resolve.new
+
+                                #set OLD to NEW
+                                cat .resolve.new > .resolve.old
+
+                        done
+
+                        #cat OLD onto end of .newfile
+                        cat .resolve.new >> .resolve.conf
+
+                        #clean up work files
+                        rm .resolve.new .resolve.old 
+
+                        #move old conf file to old conf file.bak
+                        mv "$EL" "$EL.bak"
+
+                        #move .newfile to resolve.conf file
+                        mv .resolve.conf "$EL"
+
+                        echo "Added $IP_LIST to $EL"
+                ;;
+
+                #case '-r'
+                        "$RE")
+
+                        #for each IP in IP_LIST
+                        for IP in $IP_LIST
+                        do
+                                #cat OLD into grep excluding IP lines,
+                                #storing results into NEW
+                                cat .resolve.old | grep -v "$IP" > .resolve.new
+
+                                #set OLD to NEW
+                                cat .resolve.new > .resolve.old
+
+                        done
+
+                        #move old conf file to old conf file.bak
+                        mv "$EL" "$EL.bak"
+
+                        #move .newfile to resolve.conf file
+                        mv .resolve.new "$EL"
+
+                        echo "Removed $IP_LIST from $EL"
+
+                ;;
+
+                #case else
+                        *)
+
+                        usage
+                ;;
+
+        
+        #end switch
+        esac
+
+#else
+else
+
+        usage
+
+#end
+fi
diff --git a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp
index e717d6f..97c05cc 100644
--- a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp
+++ b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp
@@ -14,7 +14,7 @@
 
 #include <assert.h>
 
-#define DNSSCRIPT "interfacednsscript"
+#define DNSSCRIPT "changedns"
 
 /**
  * Constuctor.  Set up the connection and load the first profile.
@@ -76,8 +76,8 @@ bool InterfaceSetupImp::saveSettings(){
     interfaces->setInterfaceOption("netmask", subnetMaskEdit->text());
     interfaces->setInterfaceOption("gateway", gatewayEdit->text());
     QString dns = firstDNSLineEdit->text() + " " + secondDNSLineEdit->text();
-    interfaces->setInterfaceOption("up "DNSSCRIPT" add ", dns);
-    interfaces->setInterfaceOption("down "DNSSCRIPT" remove ", dns);
+    interfaces->setInterfaceOption("up "DNSSCRIPT" -a ", dns);
+    interfaces->setInterfaceOption("down "DNSSCRIPT" -r ", dns);
   }
   
   // IP Information
@@ -133,7 +133,7 @@ void InterfaceSetupImp::setProfile(const QString &profile){
 
   // IP Information
   autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName()));
-  QString dns = interfaces->getInterfaceOption("up interfacednsscript add", error);
+  QString dns = interfaces->getInterfaceOption("up interfacednsscript -a", error);
   if(dns.contains(" ")){
     firstDNSLineEdit->setText(dns.mid(0, dns.find(" ")));
     secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length())); 
diff --git a/noncore/settings/networksettings/interfaces/changedns b/noncore/settings/networksettings/interfaces/changedns
new file mode 100644
index 0000000..4760a67
--- a/dev/null
+++ b/noncore/settings/networksettings/interfaces/changedns
@@ -0,0 +1,111 @@
+#!/bin/bash
+
+        SN="`basename $0`"# base portion of our filename
+        AE="-a"                 # switch to add an entry
+        RE="-r"                 # swithc to remove an entry
+        EL="/tmp/resolv.conf"# expected location of the system nameserver config file
+        ARGS="$@"       # friendly variable name for all args
+
+usage(){
+        echo "usage:
+$SN -a {ip} [{ip}...]
+$SN -r {ip} [{ip}...]"
+}
+
+#if are there at least two arguments?
+if [ "$#" -gt 1 ]
+then
+
+        #remove any old resolv.conf file
+        rm .resolve.conf .resolve.old .resolve.new 2> /dev/null
+                        
+        #cast current nameserver file into OLD
+        cat "$EL" > .resolve.old
+
+        #build IP list
+        for ARG in $ARGS
+        do
+                if [ "$ARG" != "$1" ]
+                then
+                        IP_LIST=`echo "$IP_LIST $ARG"`
+                fi
+        done
+
+        #select case on first switch
+        case "$1" in
+
+                #case '-a'
+                        "$AE")
+
+                        #for each IP in IP_LIST
+                        for IP in $IP_LIST
+                        do
+                                #add nameserver entery to .newfile
+                                echo "nameserver $IP" >> .resolve.conf
+
+                                #cat OLD into grep excluding IP lines,
+                                #storing results into NEW
+                                cat .resolve.old | grep -v "$IP" > .resolve.new
+
+                                #set OLD to NEW
+                                cat .resolve.new > .resolve.old
+
+                        done
+
+                        #cat OLD onto end of .newfile
+                        cat .resolve.new >> .resolve.conf
+
+                        #clean up work files
+                        rm .resolve.new .resolve.old 
+
+                        #move old conf file to old conf file.bak
+                        mv "$EL" "$EL.bak"
+
+                        #move .newfile to resolve.conf file
+                        mv .resolve.conf "$EL"
+
+                        echo "Added $IP_LIST to $EL"
+                ;;
+
+                #case '-r'
+                        "$RE")
+
+                        #for each IP in IP_LIST
+                        for IP in $IP_LIST
+                        do
+                                #cat OLD into grep excluding IP lines,
+                                #storing results into NEW
+                                cat .resolve.old | grep -v "$IP" > .resolve.new
+
+                                #set OLD to NEW
+                                cat .resolve.new > .resolve.old
+
+                        done
+
+                        #move old conf file to old conf file.bak
+                        mv "$EL" "$EL.bak"
+
+                        #move .newfile to resolve.conf file
+                        mv .resolve.new "$EL"
+
+                        echo "Removed $IP_LIST from $EL"
+
+                ;;
+
+                #case else
+                        *)
+
+                        usage
+                ;;
+
+        
+        #end switch
+        esac
+
+#else
+else
+
+        usage
+
+#end
+fi
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
index e717d6f..97c05cc 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
@@ -14,7 +14,7 @@
 
 #include <assert.h>
 
-#define DNSSCRIPT "interfacednsscript"
+#define DNSSCRIPT "changedns"
 
 /**
  * Constuctor.  Set up the connection and load the first profile.
@@ -76,8 +76,8 @@ bool InterfaceSetupImp::saveSettings(){
     interfaces->setInterfaceOption("netmask", subnetMaskEdit->text());
     interfaces->setInterfaceOption("gateway", gatewayEdit->text());
     QString dns = firstDNSLineEdit->text() + " " + secondDNSLineEdit->text();
-    interfaces->setInterfaceOption("up "DNSSCRIPT" add ", dns);
-    interfaces->setInterfaceOption("down "DNSSCRIPT" remove ", dns);
+    interfaces->setInterfaceOption("up "DNSSCRIPT" -a ", dns);
+    interfaces->setInterfaceOption("down "DNSSCRIPT" -r ", dns);
   }
   
   // IP Information
@@ -133,7 +133,7 @@ void InterfaceSetupImp::setProfile(const QString &profile){
 
   // IP Information
   autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName()));
-  QString dns = interfaces->getInterfaceOption("up interfacednsscript add", error);
+  QString dns = interfaces->getInterfaceOption("up interfacednsscript -a", error);
   if(dns.contains(" ")){
     firstDNSLineEdit->setText(dns.mid(0, dns.find(" ")));
     secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length()));