advance dhcprelay to 6a6ce24, add default dhcpv6 dualtor source inter…

…face (sonic-net#15864) sonic-build image side change to fix source interface selection in dual tor scenario. dhcprelay related PR: [master]fix dhcpv6 relay dual tor source interface selection issue sonic-dhcp-relay#42 Announce dhcprelay submodule to 6a6ce24([to invoke #40 PR]([master]fix dhcpv6 relay dual tor source interface selection issue sonic-dhcp-relay#42))
DavidZagury · Jul 17, 2023 · bd413d2 · bd413d2
1 parent 39f3e1f
commit bd413d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2
@@ -13,7 +13,7 @@
 [program:dhcp6relay]
 command=/usr/sbin/dhcp6relay
 {#- Dual ToR Option #}
-{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -d{% endif %}
+{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -u Loopback0 {% endif %}
 
 priority=3
 autostart=false

diff --git a/src/dhcprelay b/src/dhcprelay
+8 −2		src/config_interface.cpp
+3 −0		src/config_interface.h
+13 −4		src/main.cpp
+309 −96		src/relay.cpp
+57 −32		src/relay.h
+164 −69		test/mock_relay.cpp
+2 −1		test/mock_relay.h