A patch for pppoe-relay which replaces the Relay-Session-Id tag with simple variables.
This patch works with rp-pppoe-3.11. (small note: I replaced all tabs with 8 spaces inside the source code.)

More info:
https://gist.github.com/Robertof/93d5929ad30030024c29