Merge pull request 'feature/dynamic-lists' (#6 ) from feature/dynamic-lists into develop

Reviewed-on: #6 Reviewed-by: t3hn3rd <[email protected]>
Merge pull request 'Fixed a DHCP bug' (#5 ) from feature/DHCP-BugFix into develop
2025-03-22 19:24:52 +00:00 · 2025-03-22 19:13:25 +00:00 · 2025-03-22 19:02:43 +00:00 · 2025-03-22 18:42:44 +00:00 · 2025-03-17 00:00:21 +00:00 · 2025-03-15 10:52:08 +00:00
3 changed files with 1136 additions and 243 deletions
@@ -0,0 +1,13 @@
+# Map all Aaron identities to a single preferred identity
+Aaron Hance <[email protected]> aaron <aaron@6dbc8c32-bb84-406f-8558-d1cf31a0ab0c>
+Aaron Hance <[email protected]> aaronhance <[email protected]>
+Aaron Hance <[email protected]> aaron hance <[email protected]>
+Aaron Hance <[email protected]> Aaron <[email protected]>
+
+# Map all Kieron identities to a single preferred identity
+Kieron Morris <[email protected]> kieron <kieron@6dbc8c32-bb84-406f-8558-d1cf31a0ab0c>
+Kieron Morris <[email protected]> Kieron <[email protected]>
+Kieron Morris <[email protected]> t3hn3rd <[email protected]>
+
+# Map goose's multiple identities
+goose <goose@6dbc8c32-bb84-406f-8558-d1cf31a0ab0c> goose <[email protected]>
@@ -491,22 +491,26 @@ begin
        
        { Create a new header to the use in our DHCP REQUEST packet }
        SendHeader:= createHeader();
-        CopyIPv4(puint8(@Header^.Your_IP[0]), puint8(@SendHeader^.Client_IP[0]));
+        CopyIPv4(@getIPv4Config^.Address[0], puint8(@SendHeader^.Client_IP[0]));
        CopyIPv4(puint8(@Header^.Server_IP[0]), puint8(@SendHeader^.Server_IP[0]));
        processHeader(SendHeader);

        { Setup Options }
        SendOptions:= newOptions();
+
        { Create a message type option and assign it the value REQUEST }
        SendMsgType:= ord(TDHCPMessageType.REQUEST);
        NewOption(SendOptions, TDHCPOpCode.DHCP_MESSAGE_TYPE, void(@SendMsgType), 1, false);
+
        { Create a Requested IP option and assign it the value from the OFFER packet header }
-        NewOption(SendOptions, TDHCPOpCode.REQUESTED_IP_ADDRESS, void(@SendHeader^.Client_IP[0]), 4, false);
+        NewOption(SendOptions, TDHCPOpCode.REQUESTED_IP_ADDRESS, void(@Header^.Your_IP[0]), 4, false);
+
        { Create a Server Identifier Option and assign it the value from the OFFER packet options }
        Option:= getOptionByOpcode(Options, TDHCPOpCode.SERVER_IDENTIFIER);
        if Option <> nil then begin
            NewOption(SendOptions, TDHCPOpCode.SERVER_IDENTIFIER, void(@Option^.Value[0]), 4, false);
        end;
+
        { Create a Parameter Request List, Request the following: Netmask, Gateway, DNS Name & DNS Server }
        RequestParams[0]:= Ord(TDHCPOpCode.SUBNET_MASK);
        RequestParams[1]:= Ord(TDHCPOpCode.ROUTER);
@@ -522,9 +526,13 @@ begin
        MAC:= getMAC();
        packetCtx:= PPacketContext(Kalloc(sizeof(TPacketContext)));
        packetCtx^.TTL:= 128;
-        copyMAC(@BROADCAST_MAC[0], @packetCtx^.MAC.Destination[0]);
+
+        { Copy over MAC - src: broadcast - dst: DHCP Server }
        copyMAC(MAC, @packetCtx^.MAC.Source[0]);
-        copyIPv4(@NULL_IP[0], @packetCtx^.IP.Source[0]);
+        copyMAC(@BROADCAST_MAC[0], @packetCtx^.MAC.Destination[0]);
+        
+        { Copy over IP - src: NULL - dst: Broadcast }
+        CopyIPv4(@getIPv4Config^.Address[0], @packetCtx^.IP.Source[0]);
        copyIPv4(@BROADCAST_IP[0], @packetCtx^.IP.Destination[0]);

        { Setup UDPContext (UDP) & copy in the correct details }
@@ -570,7 +578,7 @@ begin

    { Check the frame is for us and then process }
    MAC:= getMAC;
-    if MACEqual(@context^.PacketContext^.MAC.Destination[0], MAC) then begin
+    if MACEqual(@context^.PacketContext^.MAC.Destination[0], MAC) or MACEqual(@context^.PacketContext^.MAC.Destination[0], BROADCAST_MAC) then begin
        Outputln('DHCP','Frame is addressed to us.');
        { Check the message type is client specific }
        If Header^.Message_Type = $02 then begin
@@ -655,7 +663,7 @@ begin
        copyMAC(@BROADCAST_MAC[0], @packetCtx^.MAC.Destination[0]);
        MAC:= getMAC;
        copyMAC(MAC, @packetCtx^.MAC.Source[0]);
-        copyIPv4(@NULL_IP[0], @packetCtx^.IP.Source[0]);
+        CopyIPv4(@getIPv4Config^.Address[0], @packetCtx^.IP.Source[0]);
        copyIPv4(@BROADCAST_IP[0], @packetCtx^.IP.Destination[0]);

        { Setup UDPContext (UDP) }
Author	SHA1	Message	Date
Aaron	28846af43c	Merge pull request 'feature/dynamic-lists' (#6 ) from feature/dynamic-lists into develop continuous-integration/drone/push Build is passing Details Reviewed-on: #6 Reviewed-by: t3hn3rd <[email protected]>	2025-03-22 19:24:52 +00:00
t3hn3rd	b1e3953960	Merge pull request 'Fixed a DHCP bug' (#5 ) from feature/DHCP-BugFix into develop continuous-integration/drone/push Build is passing Details Reviewed-on: #5	2025-03-22 19:13:25 +00:00
Aaron	7e00e23801	Fixed and expanded dynamic lists, commented whole file	2025-03-22 19:02:43 +00:00
t3hn3rd	bd12bbe862	DevOps Workflow Improvements	2025-03-22 18:42:44 +00:00
t3hn3rd	48c203f028	Fixed a DHCP bug continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details - Fixed a bug within `dhcp.pas` - `processPacket_OFFER` in which the client was responding with the client IP value within the DHCP header was incorrectly being filled out with the IP being requested & this value was then being used within the REQUESTED_IP_ADDRESS option. Corrected this to fill out the client IP with the currently configured IP, which will be NULL (0.0.0.0) on boot, and whatever is issued thereafter. - Cascaded the change to use the currently configured IP as opposed to a NULL IP to any other functions that were calling `copyIPv4(@NULL_IP[0], @packetCtx^.IP.Source[0])`. - Allowed `processPacket_OFFER` to process packets addressed to the BROADCAST MAC (WHY COULDN'T IT DO THIS ALREADY?!).	2025-03-17 00:00:21 +00:00
Aaron	d859e40e4a	Added mail map continuous-integration/drone/push Build is passing Details	2025-03-15 10:52:08 +00:00
Aaron	dbc5105b9b	Dynamic lists fixes and additions	2022-02-08 21:28:47 +00:00
Aaron	a61289a318	Dynamic list/array inital commit.-	2022-02-07 21:37:36 +00:00