Merge to implement latest changes #1

Merged
MonkWho merged 33 commits from master into master 2020-05-03 02:30:07 +05:30
2 changed files with 16 additions and 5 deletions
Showing only changes of commit f55d46e56f - Show all commits

View file

@ -308,8 +308,15 @@ There is a whole thread on this at [DSLreports](http://www.dslreports.com/forum/
However, I don't think this works for everyone. I had to explicitly tag my WAN traffic to VLAN0 which wasn't supported on my switch. However, I don't think this works for everyone. I had to explicitly tag my WAN traffic to VLAN0 which wasn't supported on my switch.
## OPNSense / FreeBSD ## OPNSense / FreeBSD
For OPNSense (tested and working on 19.1):
follow the pfSense instructions, EXCEPT:
1) modify pfatt.sh to set OPNSENSE='yes'
2) do *NOT* install the ng_etf.ko, as OPNSense is based on HardenedBSD 11.2, which is in turn based on FreeBSD 11.2 and has the module already installed.
3) put the pfatt.sh script into `/usr/local/etc/rc.syshook.d/early` as `99-pfatt.sh`
4) do *NOT* modify config.xml, nor do any of the duid stuff
5) note: You *CAN* use IPv6 Prefix id 0, as OPNSense does *NOT* assign a routeable IPv6 address to ngeth0
I haven't tried this with OPNSense or native FreeBSD, but I imagine the process is ultimately the same with netgraph. Feel free to submit a PR with notes on your experience. I haven't tried this with native FreeBSD, but I imagine the process is ultimately the same with netgraph. Feel free to submit a PR with notes on your experience.
# U-verse TV # U-verse TV

View file

@ -4,6 +4,7 @@ set -e
ONT_IF='em0' ONT_IF='em0'
RG_IF='em1' RG_IF='em1'
RG_ETHER_ADDR='xx:xx:xx:xx:xx:xx' RG_ETHER_ADDR='xx:xx:xx:xx:xx:xx'
OPNSENSE='no'
LOG=/var/log/pfatt.log LOG=/var/log/pfatt.log
getTimestamp(){ getTimestamp(){
@ -16,15 +17,18 @@ getTimestamp(){
echo "$(getTimestamp) ONT_IF: $ONT_IF" echo "$(getTimestamp) ONT_IF: $ONT_IF"
echo "$(getTimestamp) RG_IF: $RG_IF" echo "$(getTimestamp) RG_IF: $RG_IF"
echo "$(getTimestamp) RG_ETHER_ADDR: $RG_ETHER_ADDR" echo "$(getTimestamp) RG_ETHER_ADDR: $RG_ETHER_ADDR"
echo "$(getTimestamp) OPNSENSE: $OPNSENSE"
echo -n "$(getTimestamp) loading netgraph kernel modules... " echo -n "$(getTimestamp) loading netgraph kernel modules... "
/sbin/kldload -nq ng_etf /sbin/kldload -nq ng_etf
echo "OK!" echo "OK!"
echo -n "$(getTimestamp) attaching interfaces to ng_ether... " if [ ${OPNSENSE} != 'yes' ]; then
/usr/local/bin/php -r "pfSense_ngctl_attach('.', '$ONT_IF');" echo -n "$(getTimestamp) attaching interfaces to ng_ether... "
/usr/local/bin/php -r "pfSense_ngctl_attach('.', '$RG_IF');" /usr/local/bin/php -r "pfSense_ngctl_attach('.', '$ONT_IF');"
echo "OK!" /usr/local/bin/php -r "pfSense_ngctl_attach('.', '$RG_IF');"
echo "OK!"
fi
echo "$(getTimestamp) building netgraph nodes..." echo "$(getTimestamp) building netgraph nodes..."