Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pppoe-service: T6141: T5364: PPPoE-server add pado-delay without sess… #3289

Closed
wants to merge 1 commit into from

Conversation

natali-rs1985
Copy link
Contributor

@natali-rs1985 natali-rs1985 commented Apr 10, 2024

Change Summary

Fixed:

set service pppoe-server pado-delay 10

Now can (accept with delay/not to accept) new connections after N sessions:

set service pppoe-server pado-delay disable sessions 200     # not to accept connections after 200 sessions
or
set service pppoe-server pado-delay 20 sessions 200     #  accept connections with 20ms delay after 200 sessions

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):
  • [ ]

Related Task(s)

Related PR(s)

Component(s) name

pppoe-server

Proposed changes

How to test

set service pppoe-server authentication local-users username user1 password 'user1'
set service pppoe-server authentication mode 'local'
set service pppoe-server client-ip-pool first range '100.64.0.1-100.64.0.100'
set service pppoe-server default-pool 'first'
set service pppoe-server gateway-address '100.64.0.1'
set service pppoe-server interface eth1
commit

set service pppoe-server pado-delay 10
commit

vyos@vyos# cat /run/accel-pppd/pppoe.conf | grep pado-delay
pado-delay=10

Disable connections after 200 sessoins:

set service pppoe-server pado-delay disable sessions 200
commit

vyos@vyos# cat /run/accel-pppd/pppoe.conf | grep pado-delay
pado-delay=10,-1:200

Smoketest result

vyos@vyos# /usr/libexec/vyos/tests/smoke/cli/test_service_pppoe-server.py
test_accel_ipv4_pool (__main__.TestServicePPPoEServer.test_accel_ipv4_pool) ... ok
test_accel_ipv6_pool (__main__.TestServicePPPoEServer.test_accel_ipv6_pool) ...
WARNING: IPv4 Server requires gateway-address to be configured!


WARNING: 'default-ipv6-pool' is not defined

ok
test_accel_limits (__main__.TestServicePPPoEServer.test_accel_limits) ... ok
test_accel_local_authentication (__main__.TestServicePPPoEServer.test_accel_local_authentication) ...
User "test" has rate-limit configured for only one direction but both
upload and download must be given!

ok
test_accel_name_servers (__main__.TestServicePPPoEServer.test_accel_name_servers) ... ok
test_accel_next_pool (__main__.TestServicePPPoEServer.test_accel_next_pool) ...
WARNING: 'default-pool' is not defined

ok
test_accel_ppp_options (__main__.TestServicePPPoEServer.test_accel_ppp_options) ... ok
test_accel_radius_authentication (__main__.TestServicePPPoEServer.test_accel_radius_authentication) ... ok
test_accel_shaper (__main__.TestServicePPPoEServer.test_accel_shaper) ... ok
test_accel_snmp (__main__.TestServicePPPoEServer.test_accel_snmp) ... ok
test_accel_wins_server (__main__.TestServicePPPoEServer.test_accel_wins_server) ... ok
test_pppoe_limits (__main__.TestServicePPPoEServer.test_pppoe_limits) ... ok
test_pppoe_pado_delay (__main__.TestServicePPPoEServer.test_pppoe_pado_delay) ... ok
test_pppoe_server_authentication_protocols (__main__.TestServicePPPoEServer.test_pppoe_server_authentication_protocols) ... ok
test_pppoe_server_shaper (__main__.TestServicePPPoEServer.test_pppoe_server_shaper) ... ok
test_pppoe_server_vlan (__main__.TestServicePPPoEServer.test_pppoe_server_vlan) ... ok

----------------------------------------------------------------------
Ran 16 tests in 65.073s

OK

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • I have run the components SMOKETESTS if applicable
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

@vyosbot vyosbot requested a review from a team April 10, 2024 13:19
@vyosbot vyosbot requested review from dmbaturin, sarthurdev, zdc, jestabro, sever-sever and c-po and removed request for a team April 10, 2024 13:19
@sever-sever
Copy link
Member

Is this a bug or a feature request?
We shouldn't do both in one PR

The fix for https://vyos.dev/T6141 looks simple
Need to check that we cannot use delay without session, it is one check in the verify secion

vyos@r4# set service pppoe-server pado-delay 10 
Possible completions:
   sessions             Number of sessions

@natali-rs1985
Copy link
Contributor Author

Is this a bug or a feature request? We shouldn't do both in one PR

The fix for https://vyos.dev/T6141 looks simple Need to check that we cannot use delay without session, it is one check in the verify secion

vyos@r4# set service pppoe-server pado-delay 10 
Possible completions:
   sessions             Number of sessions

Got it. Then I just close this PR and create 2 separate PRs

@natali-rs1985 natali-rs1985 deleted the T6141-current branch April 11, 2024 08:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

2 participants