Browse Source

Deleted some code

Joachim M. Giæver 7 years ago
parent
commit
9f60ab6c9b
1 changed files with 7 additions and 64 deletions
  1. 7 64
      assign-ip-ssid

+ 7 - 64
assign-ip-ssid

@@ -17,40 +17,9 @@ cmd_run () {
 }
 
 iptable () {
-
-    ARG="${1}"
-    if [ $# -gt 3 ]; then
-        ARG="${ARG} -d ${4}"
-    fi
-
-    cmd_run "iptable" "iptables -C ${2} -i ${ARG} -j ${3}"
-    if [ $? -eq 1 ]; then
-        cmd_run "iptable" "iptables -I ${2} -i ${ARG} -j ${3}"
-    else
-        cmd_run "iptable" "iptables -D ${2} -i ${ARG} -j ${3}"
-        #iptable ${1} ${2} ${3} ${4}
-    fi
 }
 
 ebtable () {
-
-
-    CMD="-p ${2} -${4} ${1} -j ${3}"
-
-    if [ `ebtables -t broute -L | grep -ice "${CMD}"` -eq 0 ]; then
-        if [ $# -eq 1 ]; then
-           cmd_run "ebtable" "ebtables ${1}"
-           return $?
-        else
-            cmd_run "ebtable" "ebtables -t broute -I BROUTING ${CMD}"
-        fi
-    else
-        cmd_run "ebtable" "ebtables -t broute -D BROUTING ${CMD}"
-        if [ $# -eq 4 ]; then
-            ebtable ${1} ${2} ${3} ${4}
-        fi
-    fi
-    return $?
 }
 
 assign_ip () {
@@ -65,40 +34,14 @@ assign_ip () {
 
     LAN=$(ifconfig "br0" | sed -ne's/.*inet addr:\([^ ]*\).*$/\1/p')
 
-    echo "
-    IFACE: ${IFACE}
-    INET: ${IFACE_INET_ADDR}
-    NWRK: ${IFACE_NWRK_ADDR}
-    MASK: ${IFACE_MASK_ADDR}
-    DCHP
-        START:  ${DHCP_START}
-        END:    ${DHCP_END}
-    LAN: ${LAN}"
-
-    ifconfig "${IFACE}" > /dev/null 2>&1 || continue
-
-    cmd_run "ifconfig" "ifconfig ${IFACE} ${IFACE_INET_ADDR} netmask ${IFACE_MASK_ADDR}"
-
-    ebtable "${IFACE}" "ipv4" "DROP" "i"
-    ebtable "${IFACE}" "ipv6" "DROP" "i"
-    ebtable "${IFACE}" "arp" "DROP" "i"
-    
-    iptable "${IFACE}" "FORWARD" "ACCEPT"
-    iptable "${IFACE}" "INPUT" "ACCEPT"
-    iptable "${IFACE}" "FORWARD" "DROP" "${LAN}/24"
-    iptable "${IFACE}" "INPUT" "DROP" "${LAN}/24"
-
-    ebtable "-D FORWARD -i ${IFACE} -j DROP"
-    ebtable "-D FORWARD -o ${IFACE} -j DROP"
-
-    if [ `cat ${DNSMASQ_CONF} | grep -c ${IFACE}` -eq 0 ]; then
-        logger "dnsmasq-dhcp: Configure ${IFACE} to have special DHCP"
-        pc_append "interface=${IFACE}" ${DNSMASQ_CONF}
-        pc_append "dhcp-range=${IFACE},${DHCP_START},${DHCP_END},${IFACE_MASK_ADDR},24h" ${DNSMASQ_CONF}
-        pc_append "dhcp-option=${IFACE},3,${IFACE_INET_ADDR}" ${DNSMASQ_CONF}
+    #if [ `cat ${DNSMASQ_CONF} | grep -c ${IFACE}` -eq 0 ]; then
+    #    logger "dnsmasq-dhcp: Configure ${IFACE} to have special DHCP"
+    #    pc_append "interface=${IFACE}" ${DNSMASQ_CONF}
+    #    pc_append "dhcp-range=${IFACE},${DHCP_START},${DHCP_END},${IFACE_MASK_ADDR},24h" ${DNSMASQ_CONF}
+    #    pc_append "dhcp-option=${IFACE},3,${IFACE_INET_ADDR}" ${DNSMASQ_CONF}
         #pc_append "dhcp-option=${IFACE},6,8.8.8.8,8.8.4.4" ${DNSMASQ_CONF}
-        pc_append "dhcp-option=${IFACE},252,\"\n\"" ${DNSMASQ_CONF}
-    fi
+    #    pc_append "dhcp-option=${IFACE},252,\"\n\"" ${DNSMASQ_CONF}
+    #fi
 
 }