-
Notifications
You must be signed in to change notification settings - Fork 1.5k
[DHCP relay]: Add patch to always undef VLAN_TCI_PRESENT so as not to treat VLAN-tagged packets differently #1254
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
30 changes: 30 additions & 0 deletions
30
src/isc-dhcp/patch/0001-Always-undef-VLAN_TCI_PRESENT-so-as-not-to-treat-VLA.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| From 7fe46584c3d9cb6b1ecdee47ff5ac2b777f96ec6 Mon Sep 17 00:00:00 2001 | ||
| From: Joe LeVeque <[email protected]> | ||
| Date: Wed, 20 Dec 2017 02:18:10 +0000 | ||
| Subject: [PATCH 1/4] Always undef VLAN_TCI_PRESENT so as not to treat | ||
| VLAN-tagged packets differently | ||
|
|
||
| --- | ||
| configure.ac | 6 +++--- | ||
| 1 file changed, 3 insertions(+), 3 deletions(-) | ||
|
|
||
| diff --git a/configure.ac b/configure.ac | ||
| index 3f1415b..fcfeba0 100644 | ||
| --- a/configure.ac | ||
| +++ b/configure.ac | ||
| @@ -600,9 +600,9 @@ AC_CHECK_MEMBER(struct msghdr.msg_control,, | ||
| #include <sys/socket.h> | ||
| ]) | ||
|
|
||
| -AC_CHECK_MEMBER(struct tpacket_auxdata.tp_vlan_tci, | ||
| - [AC_DEFINE([VLAN_TCI_PRESENT], [1], [tpacket_auxdata.tp_vlan_tci present])] | ||
| - ,, [#include <linux/if_packet.h>]) | ||
| +#AC_CHECK_MEMBER(struct tpacket_auxdata.tp_vlan_tci, | ||
| +# [AC_DEFINE([VLAN_TCI_PRESENT], [1], [tpacket_auxdata.tp_vlan_tci present])] | ||
| +# ,, [#include <linux/if_packet.h>]) | ||
|
|
||
| libbind= | ||
| AC_ARG_WITH(libbind, | ||
| -- | ||
| 2.1.4 | ||
|
|
4 changes: 2 additions & 2 deletions
4
...on-82-circuit-ID-and-remote-ID-fiel.patch → ...on-82-circuit-ID-and-remote-ID-fiel.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From 284c87ff4b3873d0215904273fe3c86b07b4ba94 Mon Sep 17 00:00:00 2001 | ||
| From c2361e2bf24408cc21a4691c3897cc64c95372f1 Mon Sep 17 00:00:00 2001 | ||
| From: Joe LeVeque <[email protected]> | ||
| Date: Mon, 11 Dec 2017 23:21:08 +0000 | ||
| Subject: [PATCH 1/3] Customizable Option 82 circuit ID and remote ID fields | ||
| Subject: [PATCH 2/4] Customizable Option 82 circuit ID and remote ID fields | ||
|
|
||
| --- | ||
| relay/dhcrelay.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++--------- | ||
|
|
||
4 changes: 2 additions & 2 deletions
4
...ning-name-of-physical-interface-tha.patch → ...ning-name-of-physical-interface-tha.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From caad3e05c31c9fad8cda378ce95a1969def771a2 Mon Sep 17 00:00:00 2001 | ||
| From 236d4f1cb0afa2bee22f47a48b725427bfcb5a9c Mon Sep 17 00:00:00 2001 | ||
| From: Joe LeVeque <[email protected]> | ||
| Date: Mon, 11 Dec 2017 23:39:10 +0000 | ||
| Subject: [PATCH 2/3] Support for obtaining name of physical interface that is | ||
| Subject: [PATCH 3/4] Support for obtaining name of physical interface that is | ||
| a member of a bridge interface | ||
|
|
||
| --- | ||
|
|
||
4 changes: 2 additions & 2 deletions
4
...ng-port-alias-map-file-to-replace-p.patch → ...ng-port-alias-map-file-to-replace-p.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From 3a42b497716375c9347b51c3a28c5e91e7cd4cf4 Mon Sep 17 00:00:00 2001 | ||
| From 1092578a8415b9d49182c2b9825753e96481246a Mon Sep 17 00:00:00 2001 | ||
| From: Joe LeVeque <[email protected]> | ||
| Date: Tue, 12 Dec 2017 00:49:09 +0000 | ||
| Subject: [PATCH 3/3] Support for loading port alias map file to replace port | ||
| Subject: [PATCH 4/4] Support for loading port alias map file to replace port | ||
| name with alias in circuit id | ||
|
|
||
| --- | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| # This series applies on GIT commit ee3dffdda38a8cfc6ad2005d8d64a165d2a709ba | ||
| 0001-Customizable-Option-82-circuit-ID-and-remote-ID-fiel.patch | ||
| 0002-Support-for-obtaining-name-of-physical-interface-tha.patch | ||
| 0003-Support-for-loading-port-alias-map-file-to-replace-p.patch | ||
| 0001-Always-undef-VLAN_TCI_PRESENT-so-as-not-to-treat-VLA.patch | ||
| 0002-Customizable-Option-82-circuit-ID-and-remote-ID-fiel.patch | ||
| 0003-Support-for-obtaining-name-of-physical-interface-tha.patch | ||
| 0004-Support-for-loading-port-alias-map-file-to-replace-p.patch | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
usually, this new patch should be the last one.