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

Update DHCP Ranges #179

Merged
merged 3 commits into from
Nov 29, 2023
Merged

Update DHCP Ranges #179

merged 3 commits into from
Nov 29, 2023

Conversation

FletcherS7
Copy link
Contributor

Updated DHCP ranges to match FIRST FMS config
https://docs.wpilib.org/en/stable/docs/networking/networking-introduction/networking-basics.html#ethernet-wireless

Team DHCP range is now 10.TE.AM.20 - 10.TE.AM.199
VLAN100 DHCP range is now 10.0.100.126 - 10.0.100.199, 10.0.100.226 - 10.0.100.254

@patfair
Copy link
Member

patfair commented Nov 29, 2023

Looks like there's a failed test that may have caught a legitimate bug.

@ejordan376
Copy link
Contributor

Looks like you need to pass "teamPartialIp" 2 more times in network/switch.go between lines 92 and 93.

@FletcherS7
Copy link
Contributor Author

FletcherS7 commented Nov 29, 2023

If I'm understanding this right, does this look correct.

                        addTeamVlansCommand += fmt.Sprintf(
			"ip dhcp excluded-address 10.%s.1 10.%s.19\n"+
			"ip dhcp excluded-address 10.%s.200 10.%s.254\n"+
				"ip dhcp pool dhcp%d\n"+
				"network 10.%s.0 255.255.255.0\n"+
				"default-router 10.%s.%d\n"+
				"lease 7\n"+
				"access-list 1%d permit ip 10.%s.0 0.0.0.255 host %s\n"+
				"access-list 1%d permit udp any eq bootpc any eq bootps\n"+
				"interface Vlan%d\nip address 10.%s.%d 255.255.255.0\n",
			teamPartialIp,
			teamPartialIp,
			teamPartialIp,
			teamPartialIp,
			vlan,
			teamPartialIp,
			teamPartialIp,
			switchTeamGatewayAddress,
			vlan,
			teamPartialIp,
			ServerIpAddress,
			vlan,
			vlan,
			teamPartialIp,
			switchTeamGatewayAddress,
		        )

@patfair patfair merged commit db7aab8 into Team254:main Nov 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants