diff options
| -rw-r--r-- | debian/ufw-zerotier-one | 4 | ||||
| -rw-r--r-- | debian/zerotier-one.service | 3 | ||||
| -rw-r--r-- | rule-compiler/rule-compiler.js | 6 |
3 files changed, 11 insertions, 2 deletions
diff --git a/debian/ufw-zerotier-one b/debian/ufw-zerotier-one new file mode 100644 index 00000000..7c290894 --- /dev/null +++ b/debian/ufw-zerotier-one @@ -0,0 +1,4 @@ +[zerotier-one] +title=ZeroTier One +description=A planetary Ethernet switch +ports=9993/udp diff --git a/debian/zerotier-one.service b/debian/zerotier-one.service index a0126b7f..133d4490 100644 --- a/debian/zerotier-one.service +++ b/debian/zerotier-one.service @@ -1,6 +1,7 @@ [Unit] Description=ZeroTier One -After=network.target +After=network-online.target +Wants=network-online.target [Service] ExecStart=/usr/sbin/zerotier-one diff --git a/rule-compiler/rule-compiler.js b/rule-compiler/rule-compiler.js index bd84824e..9cc4f76a 100644 --- a/rule-compiler/rule-compiler.js +++ b/rule-compiler/rule-compiler.js @@ -226,12 +226,16 @@ function _cleanMac(m) { m = m.toLowerCase(); var m2 = ''; + let charcount = 0; for(let i=0;((i<m.length)&&(m2.length<17));++i) { let c = m.charAt(i); if ("0123456789abcdef".indexOf(c) >= 0) { m2 += c; - if ((m2.length > 0)&&(m2.length !== 17)&&((m2.length & 1) === 0)) + charcount++; + if ((m2.length > 0)&&(m2.length !== 17)&&(charcount >= 2) ) { m2 += ':'; + charcount=0; + } } } return m2; |