Changeset 8b987c8 in freewrt

Timestamp:

Sep 18, 2006, 9:42:28 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

45e7b1b

Parents:

93cb32c

Message:

add the old /usr/lib/common.awk from base-files rev. 471
to /usr/lib/webif/common.awk and use it; bump package patchlevel

this _might_ unbreak webif

reported by ArteK in IRC

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@634 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/webif

Files:

• Makefile (modified) (1 diff)
• files/usr/lib/webif/common.awk (modified) (1 diff)
• files/www/cgi-bin/webif/lan.sh (modified) (1 diff)

package/webif/Makefile

@@ -9 +9 @@
 PKG_NAME:=              webif
 PKG_VERSION:=           0.2
-PKG_RELEASE:=           2
+PKG_RELEASE:=           3
 
 include $(TOPDIR)/mk/package.mk

package/webif/files/usr/lib/webif/common.awk

@@ +1 @@
+# $FreeWRT$
+
+function portstr(type, str) {
+        gsub(/-/, ":", str)
+        if (insmod_mport != 1) {
+                print "insmod ipt_multiport >&- 2>&-"
+                insmod_mport = 1
+        }
+        if (type == "src") return " -m multiport --sports " str
+        else return " -m multiport --dports " str
+}
+
+function str2ipt(str) {
+        str2data(str)
+        _cmd = ""
+        if (_l["src"] != "") _cmd = _cmd " -s " _l["src"]
+        if (_l["dest"] != "") _cmd = _cmd " -d " _l["dest"]
+        if (_l["proto"] != "") {
+                _cmd = _cmd " -p " _l["proto"]
+        }
+        # scripts need to check for proto="" and emit two rules in that case
+        if ((_l["proto"] == "") || (_l["proto"] == "tcp") || (_l["proto"] == "udp")) {
+                if (_l["sport"] != "") _cmd = _cmd portstr("src", _l["sport"])
+                if (_l["dport"] != "") _cmd = _cmd portstr("dest", _l["dport"])
+        }
+        if (_l["layer7"] != "") {
+                if (insmod_l7 != 1) {
+                        print "insmod ipt_layer7 >&- 2>&-"
+                        insmod_l7 = 1
+                }
+                _cmd = _cmd " -m layer7 --l7proto " _l["layer7"]
+        }
+        return _cmd
+}
+
+function str2data(str) {
+        delete _l
+        _n = split(str, _o, "[\t ]")
+        for (_i = 1; _i <= _n; _i++) {
+                _n2 = split(_o[_i], _c, "=")
+                if (_n2 == 2) _l[_c[1]] = _c[2]
+        }
+}
+
+function bitcount(c) {
+        c=and(rshift(c, 1),0x55555555)+and(c,0x55555555)
+        c=and(rshift(c, 2),0x33333333)+and(c,0x33333333)
+        c=and(rshift(c, 4),0x0f0f0f0f)+and(c,0x0f0f0f0f)
+        c=and(rshift(c, 8),0x00ff00ff)+and(c,0x00ff00ff)
+        c=and(rshift(c,16),0x0000ffff)+and(c,0x0000ffff)
+        return c
+}
+
+function validate_netmask(nm) {
+        return and(-nm,compl(nm))
+}
+
+function ip2int(ip) {
+        for (ret=0,n=split(ip,a,"\."),x=1;x<=n;x++) ret=or(lshift(ret,8),a[x]) 
+        return ret
+}
+
+function int2ip(ip,ret,x) {
+        ret=and(ip,255)
+        ip=rshift(ip,8)
+        for(;x<3;ret=and(ip,255)"."ret,ip=rshift(ip,8),x++);
+        return ret
+}
+
 function start_form(title, field_opts, field_opts2) {
         print "<div class=\"settings\"" field_opts ">"

package/webif/files/www/cgi-bin/webif/lan.sh

@@ -38 +38 @@
                 save_setting dhcp dhcp_enabled $FORM_dhcp_enabled
                 FORM_dhcp_num=$(
-awk -f /usr/lib/common.awk -f - $FORM_dhcp_start $FORM_dhcp_end <<EOF
+awk -f /usr/lib/webif/common.awk -f - $FORM_dhcp_start $FORM_dhcp_end <<EOF
 BEGIN   {
         ipstart=ip2int(ARGV[1])