lp:~martin-lp/hipl/hipfwconf

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:hipl at revision 6121

Diego Biurrun: Approve on 2011-11-08

Miika Komu: Pending requested 2011-11-08

René Hummen: Pending requested 2011-11-08

Diff: 1465 lines (+419/-198)

19 files modified

doc/HOWTO.xml.in (+50/-50)
firewall/cache.c (+1/-1)
firewall/conntrack.c (+54/-1)
firewall/conntrack.h (+2/-0)
firewall/firewall.c (+32/-17)
firewall/firewall.h (+3/-1)
firewall/firewall_control.c (+30/-3)
firewall/firewall_control.h (+2/-2)
hipd/init.c (+2/-2)
hipd/nat.c (+1/-1)
hipd/registration.c (+1/-1)
lib/core/conf.c (+161/-81)
lib/core/conf.h (+4/-0)
lib/core/hostid.c (+1/-1)
lib/core/message.c (+69/-32)
lib/core/message.h (+1/-0)
lib/tool/nlink.c (+1/-1)
tools/hipconf.c (+1/-1)
tools/hipdnsproxy/hipdnsproxy.in (+3/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

6143. By David Martin on 2011-11-08

Make conf_get_process() const-correct.

6142. By David Martin on 2011-11-08

Return enum daemon_name instead of int in conf_get_process().

If we have got a named enum for that purpose we may as well use it.

6141. By David Martin on 2011-11-08

Move daemon_name enum to lib/core/conf.c as it is only used there.

6140. By David Martin on 2011-11-08

Use 'the' when referring to the daemon in conf.c/message.c error messages.

Sounds a lot better this way.

6139. By David Martin on 2011-11-08

Refer to daemon in error messages instead of mentioning both hipd and hipfw.

6138. By David Martin on 2011-11-08

Make daemon_name enum static, it is local to lib/core/conf.c.

6137. By David Martin on 2011-11-08

Cosmetics: Fix typo in conf_get_process() documentation.

6136. By David Martin on 2011-11-08

Make hipfwconf_usage static as it's local to conf.c.

6135. By David Martin on 2011-11-08

Correct header #include ordering in firewall_control.c.

6134. By David Martin on 2011-11-07

Fix some stray error messages referring incorrectly only to the HIP daemon.

Make them more generic by adding the firewall as well.