matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DHCP relay]: Add patch to always undef VLAN_TCI_PRESENT so as not to treat VLAN-tagged packets differently (#1254)

Browse Source
This commit is contained in:
Joe LeVeque 2017-12-20 11:22:08 -08:00 committed by GitHub
parent ab2d066a4d
commit 64602ad5b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/isc-dhcp/patch/0001-Always-undef-VLAN_TCI_PRESENT-so-as-not-to-treat-VLA.patch Normal file
View File

@ -0,0 +1,30 @@
From 7fe46584c3d9cb6b1ecdee47ff5ac2b777f96ec6 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
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
src/isc-dhcp/patch/0001-Customizable-Option-82-circuit-ID-and-remote-ID-fiel.patch → src/isc-dhcp/patch/0002-Customizable-Option-82-circuit-ID-and-remote-ID-fiel.patch
View File

@ -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 <jolevequ@microsoft.com>
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
src/isc-dhcp/patch/0002-Support-for-obtaining-name-of-physical-interface-tha.patch → src/isc-dhcp/patch/0003-Support-for-obtaining-name-of-physical-interface-tha.patch
View File

@ -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 <jolevequ@microsoft.com>
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
src/isc-dhcp/patch/0003-Support-for-loading-port-alias-map-file-to-replace-p.patch → src/isc-dhcp/patch/0004-Support-for-loading-port-alias-map-file-to-replace-p.patch
View File

@ -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 <jolevequ@microsoft.com>
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
---

7
src/isc-dhcp/patch/series
View File

@ -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