Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / phosphor-networkd / 7233c585417fa2b409c8e0ac90c2f2195393ea67
commit7233c585417fa2b409c8e0ac90c2f2195393ea67[log] [tgz]
authorLei YU <yulei.sh@bytedance.com>Thu Apr 08 14:39:43 2021 +0800
committerLei YU <yulei.sh@bytedance.com>Fri May 07 11:36:11 2021 +0000
tree5e8dd86c794b17b4b6a65c389421fee00d52ab20
parent8173e02d5b223ff8680cd7ad2bda41bc02726f21 [diff]
Fix the same static IP setting from DHCP

When the BMC already has a DHCP IP address, and we set the same static
IP address, it fails.

It is because the AddressMap is a std::map and the code was using
emplace() to add the new created IP address. If the address is already
in the map, the emplace() does not replace the object but does nothing.

Change the emplace() to insert_or_assign(), so that the newly created IP
address is added into the map.

Resolves: openbmc/phosphor-networkd#38
Tested: Verify the static IP address could be set.

Signed-off-by: Lei YU <yulei.sh@bytedance.com>
Change-Id: Ic6756c81c4981589c8bbe88e990304ed1df6b59a
1 file changed
tree: 5e8dd86c794b17b4b6a65c389421fee00d52ab20
  1. docs/
  2. test/
  3. xyz/
  4. .clang-format
  5. .gitignore
  6. .shellcheck
  7. argument.cpp
  8. argument.hpp
  9. bootstrap.sh
  10. config_parser.cpp
  11. config_parser.hpp
  12. configure.ac
  13. dhcp_configuration.cpp
  14. dhcp_configuration.hpp
  15. dns_updater.cpp
  16. dns_updater.hpp
  17. ethernet_interface.cpp
  18. ethernet_interface.hpp
  19. ipaddress.cpp
  20. ipaddress.hpp
  21. LICENSE
  22. MAINTAINERS
  23. Makefile.am
  24. ncsi_netlink_main.cpp
  25. ncsi_util.cpp
  26. ncsi_util.hpp
  27. neighbor.cpp
  28. neighbor.hpp
  29. netlink.cpp
  30. netlink.hpp
  31. network_config.cpp
  32. network_config.hpp
  33. network_manager.cpp
  34. network_manager.hpp
  35. network_manager_main.cpp
  36. README.md
  37. routing_table.cpp
  38. routing_table.hpp
  39. rtnetlink_server.cpp
  40. rtnetlink_server.hpp
  41. system_configuration.cpp
  42. system_configuration.hpp
  43. types.hpp
  44. util.cpp
  45. util.hpp
  46. vlan_interface.cpp
  47. vlan_interface.hpp
  48. watch.cpp
  49. watch.hpp
  50. xyz.openbmc_project.Network.conf.in
  51. xyz.openbmc_project.Network.service.in
README.md

To Build

To build this package, do the following steps:

    1. ./bootstrap.sh
    2. ./configure ${CONFIGURE_FLAGS}
    3. make

To clean the repository run `./bootstrap.sh clean`.