After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 742719 - [review] update systemd dhcp library [th/systemd-dhcp-integration]
[review] update systemd dhcp library [th/systemd-dhcp-integration]
Status: RESOLVED FIXED
Product: NetworkManager
Classification: Platform
Component: general
git master
Other Linux
: Normal normal
: ---
Assigned To: NetworkManager maintainer(s)
NetworkManager maintainer(s)
Depends on:
Blocks:
 
 
Reported: 2015-01-10 18:46 UTC by Thomas Haller
Modified: 2015-03-03 11:38 UTC
See Also:
GNOME target: ---
GNOME version: ---


Description Thomas Haller 2015-01-10 18:46:02 UTC 
Reimport dhcp source from current upstream systemd
Comment 1 Thomas Haller 2015-01-10 18:46:51 UTC 
branch th/systemd-dhcp-integration
Comment 2 Dan Winship 2015-01-11 15:04:38 UTC 
>    dhcp: fix logging by reusing defines from systemds 'log.h'

"fix" how? What exactly does this patch do?


>    dhcp: cherry-pick path_kill_slashes()

I think it would be better to import (and then #ifdef out) the whole file, so that we get future updates to that function automatically.
Comment 3 Thomas Haller 2015-01-11 21:28:46 UTC 
Reworked and rebased.

- improved commit messages
- add two dhcp/trival commits
- update to newest systemd commit
- new commit "dhcp: add prefix to logging lines from systemd library"
Comment 4 Dan Williams 2015-01-13 16:53:52 UTC 
Patrik just posted a series of patches for DHCPv6, and upstream usually applies them pretty quickly.  Should we wait until upstream applies them and then do an import? Then we can also get DHCPv6 working for the internal client now that the code is more complete.
Comment 5 Thomas Haller 2015-02-02 16:08:10 UTC 
Repushed.


useful to see the difference:


HEAD=th/systemd-dhcp-integration
MERGE=$(git rev-list --merges -n1 $HEAD)

# how did we modify the systemd code?
git diffs $MERGE^1 $HEAD -- src/dhcp-manager/systemd-dhcp/

# what changed in systemd since last merge:
git diffs $MERGE^2 $HEAD -- src/dhcp-manager/systemd-dhcp/
git diffs $MERGE^2 $HEAD -- src/dhcp-manager/systemd-dhcp/src/libsystemd-network/


note that systemd changed the duid generation, so when updating NM, we will get a different IP address from server. I think that is acceptable, as dhcp-internal was in an early stage.
Comment 6 Dan Williams 2015-02-17 15:10:07 UTC 
Changes look good to me, and still work with IPv4, and still retrieve the same IP address across runs.
Comment 7 Thomas Haller 2015-03-02 13:29:31 UTC 
merged first (uncontroversial) part of cleanups before reimporting dhcp code:

http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=def82cddea1906b5d721659a567f45fac247f724
Comment 8 Thomas Haller 2015-03-02 15:42:26 UTC 
reimported newest version from systemd master, and repushed.
Comment 9 Dan Williams 2015-03-02 17:15:01 UTC 
The only comment I had was that we could use the glibc function if_indextoname() in dhcp_identifier_set_iaid() and get rid of our custom additions of sd_dhcp_client_set_ifname() and dhcp_identifier_set_iaid_from_name().
Comment 10 Thomas Haller 2015-03-02 19:30:57 UTC 
(In reply to Dan Williams from comment #9)
> The only comment I had was that we could use the glibc function
> if_indextoname() in dhcp_identifier_set_iaid() and get rid of our custom
> additions of sd_dhcp_client_set_ifname() and
> dhcp_identifier_set_iaid_from_name().

done and repushed.