i/OrbbecSDK_ROS2
1
0
Fork 0
mirror of https://github.com/orbbec/OrbbecSDK_ROS2.git synced 2026-10-03 19:47:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: validate old IP format when DHCP is enabled in IP configuration tool

Browse Source
This commit is contained in:
ob-yalian
2026-04-03 22:03:05 +08:00
parent 8f3e2dbef4
commit 205e8916fc
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
orbbec_camera/tools/ip_config_tool.cpp
+13
View File
@@ -301,12 +301,21 @@ int main(int argc, char **argv) {
RCLCPP_INFO(logger, "Connecting to device %s:%d ...", args.old_ip.c_str(), args.port);
auto device = context->createNetDevice(args.old_ip.c_str(), args.port);
uint8_t old_ip_bytes[4] = {0};
if (args.dhcp && !parseIpString(args.old_ip, old_ip_bytes)) {
RCLCPP_ERROR(logger, "Invalid old_ip format: %s", args.old_ip.c_str());
rclcpp::shutdown();
return 1;
}
const bool v2_supported =
device->isPropertySupported(OB_STRUCT_DEVICE_IP_ADDR_CONFIG_V2, OB_PERMISSION_READ_WRITE);
if (v2_supported) {
OBNetIpConfigV2 ip_config_v2{};
if (args.dhcp) {
ip_config_v2.flags = OB_NET_IP_FLAG_DHCP;
// Some devices reject all-zero IP payload when enabling DHCP.
std::memcpy(ip_config_v2.address, old_ip_bytes, sizeof(old_ip_bytes));
} else {
ip_config_v2.flags = OB_NET_IP_FLAG_PERSISTENT;
}
@@ -319,6 +328,10 @@ int main(int argc, char **argv) {
} else {
OBNetIpConfig ip_config{};
ip_config.dhcp = args.dhcp ? 1 : 0;
if (args.dhcp) {
// Some devices reject all-zero IP payload when enabling DHCP.
std::memcpy(ip_config.address, old_ip_bytes, sizeof(old_ip_bytes));
}
RCLCPP_WARN(logger,
"Device does not support IP config V2 (1088), fallback to legacy property (1041).");