From 98e35296af2631886257cd8f8e2deb2ed08ef376 Mon Sep 17 00:00:00 2001 From: Luka Kudra Date: Mon, 23 Nov 2020 16:30:50 +0100 Subject: [PATCH] opensync: add proto definitions for dhcp events Signed-off-by: Luka Kudra --- .../24-dhcp-events-proto-definitions.patch | 101 +++++++++++------- 1 file changed, 60 insertions(+), 41 deletions(-) diff --git a/feeds/wlan-ap/opensync/patches/24-dhcp-events-proto-definitions.patch b/feeds/wlan-ap/opensync/patches/24-dhcp-events-proto-definitions.patch index 15cb5013..51287a9d 100644 --- a/feeds/wlan-ap/opensync/patches/24-dhcp-events-proto-definitions.patch +++ b/feeds/wlan-ap/opensync/patches/24-dhcp-events-proto-definitions.patch @@ -2,83 +2,102 @@ Index: opensync-2.0.5.0/interfaces/opensync_stats.proto =================================================================== --- opensync-2.0.5.0.orig/interfaces/opensync_stats.proto +++ opensync-2.0.5.0/interfaces/opensync_stats.proto -@@ -805,8 +805,79 @@ message EventReport { +@@ -796,8 +796,98 @@ message EventReport { repeated ClientConnectEvent client_connect_event = 10; } -+ /* DHCP Common Data */ -+ message DhcpCommonData { -+ required uint32 x_id = 1; ++ /* DHCP Ack Event */ ++ message DhcpAckEvent { ++ optional uint32 x_id = 1; + optional uint32 vlan_id = 2; + optional bytes dhcp_server_ip = 3; + optional bytes client_ip = 4; + optional bytes relay_ip = 5; + optional string device_mac_address = 6; -+ optional uint32 timestamp_ms = 7; -+ } -+ -+ /* DHCP Ack Event */ -+ message DhcpAckEvent { -+ optional DhcpCommonData dhcp_common_data = 1; -+ optional bytes subnet_mask = 2; -+ optional bytes primary_dns = 3; -+ optional bytes secondary_dns = 4; -+ optional uint32 lease_time = 5; -+ optional uint32 renewal_time = 6; -+ optional uint32 rebinding_time = 7; -+ optional uint32 time_offset = 8; -+ optional bytes gateway_ip = 9; ++ optional bytes subnet_mask = 7; ++ optional bytes primary_dns = 8; ++ optional bytes secondary_dns = 9; ++ optional uint32 lease_time = 10; ++ optional uint32 renewal_time = 11; ++ optional uint32 rebinding_time = 12; ++ optional uint32 time_offset = 13; ++ optional bytes gateway_ip = 14; + } + + /* DHCP Nak Event */ + message DhcpNakEvent { -+ optional DhcpCommonData dhcp_common_data = 1; -+ optional bool from_internal = 2; ++ optional uint32 x_id = 1; ++ optional uint32 vlan_id = 2; ++ optional bytes dhcp_server_ip = 3; ++ optional bytes client_ip = 4; ++ optional bytes relay_ip = 5; ++ optional string device_mac_address = 6; ++ optional bool from_internal = 7; + } + + /* DHCP Offer Event */ + message DhcpOfferEvent { -+ optional DhcpCommonData dhcp_common_data = 1; -+ optional bool from_internal = 2; ++ optional uint32 x_id = 1; ++ optional uint32 vlan_id = 2; ++ optional bytes dhcp_server_ip = 3; ++ optional bytes client_ip = 4; ++ optional bytes relay_ip = 5; ++ optional string device_mac_address = 6; ++ optional bool from_internal = 7; + } + + /* DHCP Inform Event */ + message DhcpInformEvent { -+ optional DhcpCommonData dhcp_common_data = 1; ++ optional uint32 x_id = 1; ++ optional uint32 vlan_id = 2; ++ optional bytes dhcp_server_ip = 3; ++ optional bytes client_ip = 4; ++ optional bytes relay_ip = 5; ++ optional string device_mac_address = 6; + } + + /* DHCP Decline Event */ + message DhcpDeclineEvent { -+ optional DhcpCommonData dhcp_common_data = 1; ++ optional uint32 x_id = 1; ++ optional uint32 vlan_id = 2; ++ optional bytes dhcp_server_ip = 3; ++ optional bytes client_ip = 4; ++ optional bytes relay_ip = 5; ++ optional string device_mac_address = 6; + } + + /* DHCP Request Event */ + message DhcpRequestEvent { -+ optional DhcpCommonData dhcp_common_data = 1; -+ optional string hostname = 2; ++ optional uint32 x_id = 1; ++ optional uint32 vlan_id = 2; ++ optional bytes dhcp_server_ip = 3; ++ optional bytes client_ip = 4; ++ optional bytes relay_ip = 5; ++ optional string device_mac_address = 6; ++ optional string hostname = 7; + } + + /* DHCP Discover Event */ + message DhcpDiscoverEvent { -+ optional DhcpCommonData dhcp_common_data = 1; -+ optional string hostname = 2; -+ } -+ -+ /* DHCP Transaction */ -+ message DhcpTransaction { -+ repeated DhcpAckEvent dhcp_ack_event = 1; -+ repeated DhcpNakEvent dhcp_nak_event = 2; -+ repeated DhcpOfferEvent dhcp_offer_event = 3; -+ repeated DhcpInformEvent dhcp_inform_event = 4; -+ repeated DhcpDeclineEvent dhcp_decline_event = 5; -+ repeated DhcpRequestEvent dhcp_request_event = 6; -+ repeated DhcpDiscoverEvent dhcp_discover_event = 7; ++ optional uint32 x_id = 1; ++ optional uint32 vlan_id = 2; ++ optional bytes dhcp_server_ip = 3; ++ optional bytes client_ip = 4; ++ optional bytes relay_ip = 5; ++ optional string device_mac_address = 6; ++ optional string hostname = 7; + } + /* Multiple Client Sessions */ repeated ClientSession client_session = 1; -+ /* Multiple DHCP Transactions */ -+ repeated DhcpTransaction dhcp_transaction = 2; ++ /* DHCP events */ ++ repeated DhcpAckEvent dhcp_ack_event = 2; ++ repeated DhcpNakEvent dhcp_nak_event = 3; ++ repeated DhcpOfferEvent dhcp_offer_event = 4; ++ repeated DhcpInformEvent dhcp_inform_event = 5; ++ repeated DhcpDeclineEvent dhcp_decline_event = 6; ++ repeated DhcpRequestEvent dhcp_request_event = 7; ++ repeated DhcpDiscoverEvent dhcp_discover_event = 8; } ////////////////////////////////////////////////////////////////////////////////