Skip to content

[dhcp_relay] sonic dhcp relay agent for IPv4#67

Merged
Blueve merged 20 commits intosonic-net:masterfrom
cshivashgit:sonic-dhcp4relay
Nov 5, 2025
Merged

[dhcp_relay] sonic dhcp relay agent for IPv4#67
Blueve merged 20 commits intosonic-net:masterfrom
cshivashgit:sonic-dhcp4relay

Conversation

@cshivashgit
Copy link
Copy Markdown
Contributor

@cshivashgit cshivashgit commented Apr 30, 2025

Why I did it
DHCP Relay agent for IPv4

How I did it
Merging dhcp4 changes into this repo, created dhcp6[existing code] and dhcp4[new code] folders

HLD link:
https://github.com/sonic-net/SONiC/blob/2eb20e2d2bcc181ab8cf1f502173ac0dbd528698/doc/DHCPv4_relay/DHCPv4-relay-agent-High-Level-Design.md

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@ashutosh-agrawal
Copy link
Copy Markdown
Member

@yaqiangz Appreciate if you can provide feedback on the directory/file structure.

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

…and dhcp4relay[new code] folders

Co-authored-by: Akshath TR <akshath.t.r@gmail.com>
Co-authored-by: Ashutosh Agrawal <ashu@cisco.com>
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

Added missed declarations
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

Move pcappp_v24.09.zip and patch folder inside dhcp4relay directory
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

Blueve
Blueve previously approved these changes Nov 3, 2025
@Blueve
Copy link
Copy Markdown

Blueve commented Nov 3, 2025

Close and re-open to rerun PR test

@Blueve Blueve closed this Nov 3, 2025
@Blueve Blueve reopened this Nov 3, 2025
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

Signed-off-by: Ashutosh Agrawal <ashu@cisco.com>
Fixed a typo to retrigger PR checks
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@Blueve Blueve merged commit 8772dd5 into sonic-net:master Nov 5, 2025
8 checks passed
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is there a random zip file added here? If this is actually needed as a build dependency, compile it as a separate application or add it into the slave container.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@saiarcot895 Since, we are applying a minor patch on top of the downloaded PCAP++ source code, we didn't include it in the slave container. But I've modified the build process to now download the file instead of including it in the code. Please review the changes in this PR

ashutosh-agrawal added a commit to cshivashgit/sonic-dhcp-relay that referenced this pull request Dec 8, 2025
- Replace 17MB pcappp_v24.09.zip binary with wget download from GitHub
- Download from official release: github.com/seladb/PcapPlusPlus/archive/refs/tags/v24.09.tar.gz
- Add SHA256 checksum verification (b14998ecf5718c2bfb6f709060e53f7ef67639b98bf2222a3cd23d820d70acdc)
- Fix patch file paths to apply cleanly (remove PcapPlusPlus-24.09/ prefix)
- Add .gitignore to exclude downloaded artifacts

Addresses review comment from saiarcot895 on PR sonic-net#67
ashutosh-agrawal added a commit to cshivashgit/sonic-dhcp-relay that referenced this pull request Dec 8, 2025
- Replace 17MB pcappp_v24.09.zip binary with wget download from GitHub
- Download from official release: github.com/seladb/PcapPlusPlus/archive/refs/tags/v24.09.tar.gz
- Add SHA256 checksum verification (b14998ecf5718c2bfb6f709060e53f7ef67639b98bf2222a3cd23d820d70acdc)
- Fix patch file paths to apply cleanly (remove PcapPlusPlus-24.09/ prefix)
- Add .gitignore to exclude downloaded artifacts

Addresses review comment from saiarcot895 on PR sonic-net#67
Blueve pushed a commit that referenced this pull request Dec 11, 2025
* [sonic-dhcp4relay]: Defect fixes

Below sonic-mgmt issues are fixed:
1. Random source port
2. Padding issues
3. DHCP Server fixes

Signed-off-by: Shivashankar CR <shivashankar.c.r@gmail.com>

* [sonic-dhcp4relay] Smart switch support

Signed-off-by: Shivashankar CR <shivashankar.c.r@gmail.com>

* Remove binary zip file and download PcapPlusPlus during build

- Replace 17MB pcappp_v24.09.zip binary with wget download from GitHub
- Download from official release: github.com/seladb/PcapPlusPlus/archive/refs/tags/v24.09.tar.gz
- Add SHA256 checksum verification (b14998ecf5718c2bfb6f709060e53f7ef67639b98bf2222a3cd23d820d70acdc)
- Fix patch file paths to apply cleanly (remove PcapPlusPlus-24.09/ prefix)
- Add .gitignore to exclude downloaded artifacts

Addresses review comment from saiarcot895 on PR #67

---------

Signed-off-by: Shivashankar CR <shivashankar.c.r@gmail.com>
Co-authored-by: Ashutosh Agrawal <ashu@cisco.com>
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.

10 participants