l2tp_broker.py.patch 1.3 KB

12345678910111213141516171819202122232425262728
  1. index be402cb..7e9ccd9 100644
  2. --- a/broker/l2tp_broker.py
  3. +++ b/broker/l2tp_broker.py
  4. @@ -629,13 +629,13 @@ class Tunnel(gevent.Greenlet):
  5. for session in self.sessions.values():
  6. # Invoke any pre-down hooks
  7. self.manager.hook('session.pre-down', self.id, session.id, session.name, self.pmtu, self.endpoint[0],
  8. - self.endpoint[1], self.port, self.uuid)
  9. + self.endpoint[1], self.port, self.uuid, self.external_port)
  10. self.manager.netlink.session_delete(self.id, session.id)
  11. # Invoke any down hooks
  12. self.manager.hook('session.down', self.id, session.id, session.name, self.pmtu, self.endpoint[0],
  13. - self.endpoint[1], self.port, self.uuid)
  14. + self.endpoint[1], self.port, self.uuid, self.external_port)
  15. # Transmit error message so the other end can tear down the tunnel
  16. # immediately instead of waiting for keepalive timeout
  17. @@ -685,7 +685,7 @@ class Tunnel(gevent.Greenlet):
  18. """
  19. for session in self.sessions.values():
  20. self.manager.hook('session.up', self.id, session.id, session.name, self.pmtu,
  21. - self.endpoint[0], self.endpoint[1], self.port, self.uuid)
  22. + self.endpoint[0], self.endpoint[1], self.port, self.uuid, self.external_port)
  23. def create_session(self):
  24. """