gitproxy/RTLPlayground
1
0
Fork 0
mirror of https://github.com/logicog/RTLPlayground.git synced 2026-08-30 14:52:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

system: derive the default hostname after the startup config

Browse Source 
Move the MAC-derived default name out of main() into its own function and
call it after execute_config(), returning early when the config already
set a name - a configured switch then does no work for it at all.

The body deliberately has no local variables. Locals here - counters and
pointers alike - land in the 8051's internal-RAM overlay, and on an image
with LACP and STP both enabled that overlay is exhausted: a loop makes the
linker fail with "Could not get 8 consecutive bytes in internal RAM for
area OSEG". Moving the code into its own function does not help, since the
overlay is shared across the whole image, and hoisting the locals to xdata
does not either, because itohex() is inline and brings its own frame. This
only shows up in an integrated build; the branch on its own links fine.

Suggested-by: vDorst
This commit is contained in:
d00f
2026-08-05 16:48:36 +02:00
parent 1194823cd5
commit 108ac9b8fc
1 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rtlplayground.c
+31 -13
View File
@@ -25,6 +25,7 @@
#include "machine.h"
#include "phy.h"
#include "syslog.h"
#include "httpd/page_impl.h"
extern __code const struct machine machine;
extern __xdata uint32_t flash_size;
@@ -2005,6 +2006,34 @@ void check_and_flash_update_image(void)
}
}
/* Give the switch a name carrying the tail of its MAC, so several of them on
* one network are distinguishable out of the box. Called after the startup
* config has been replayed and returns at once if that config already set a
* name, so a configured switch does no work for it (suggested in review).
*
* Written without a loop on purpose. Locals - counters and pointers alike -
* land in the 8051's internal-RAM overlay, and on an image with LACP and STP
* both enabled that overlay is exhausted: a loop here makes the linker fail
* with "Could not get 8 consecutive bytes in internal RAM for area OSEG".
* Moving the code into its own function does not help; the overlay is shared
* across the whole image. Hoisting the locals to xdata does not help either,
* because itohex() is inline and brings its own frame. */
void set_hostname_default(void)
{
if (hostname[0] != '\0')
return;
strcpy((__xdata uint8_t *)hostname, "RTLPlayground-");
hostname[14] = hex[uip_ethaddr.addr[3] >> 4];
hostname[15] = hex[uip_ethaddr.addr[3] & 0xf];
hostname[16] = hex[uip_ethaddr.addr[4] >> 4];
hostname[17] = hex[uip_ethaddr.addr[4] & 0xf];
hostname[18] = hex[uip_ethaddr.addr[5] >> 4];
hostname[19] = hex[uip_ethaddr.addr[5] & 0xf];
hostname[20] = '\0';
}
void main(void)
{
ticks = 0;
@@ -2146,19 +2175,6 @@ void main(void)
vlan_setup();
port_l2_setup();
igmp_setup();
/* Default name carries the tail of the MAC, so several switches on one
* network are distinguishable out of the box (suggested in review).
* Overridden by a "hostname ..." line in the startup config. */
strcpy((__xdata uint8_t *)hostname, "RTLPlayground-");
/* Spelled out rather than looped: locals here land in the 8051's
* internal-RAM overlay, which is full on a build with every feature on. */
hostname[14] = hex[uip_ethaddr.addr[3] >> 4];
hostname[15] = hex[uip_ethaddr.addr[3] & 0xf];
hostname[16] = hex[uip_ethaddr.addr[4] >> 4];
hostname[17] = hex[uip_ethaddr.addr[4] & 0xf];
hostname[18] = hex[uip_ethaddr.addr[5] >> 4];
hostname[19] = hex[uip_ethaddr.addr[5] & 0xf];
hostname[20] = '\0';
bandwidth_setup();
uip_init();
uip_arp_init();
@@ -2182,6 +2198,8 @@ void main(void)
early_boot_handle_button();
execute_config();
/* After the config: a name from it wins, otherwise derive one. */
set_hostname_default();
print_cmd_prompt();
idle_ready = 1;