conf: Save lxc.network.ipv4 broadcast address

Reported-by: Robert Vogelgesang <vogel@users.sourceforge.net>
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 546df53909a05cd2b37d15f819f731dcaa14a58f..fa263ef4a45f023aae70bef398c74a6bdfd13b8f 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -2274,11 +2274,19 @@ void write_config(FILE *fout, struct lxc_conf *c)
                        struct lxc_inetdev *i = it2->elem;
                        char buf[INET_ADDRSTRLEN];
                        inet_ntop(AF_INET, &i->addr, buf, sizeof(buf));
+                       fprintf(fout, "lxc.network.ipv4 = %s", buf);
+
                        if (i->prefix)
-                               fprintf(fout, "lxc.network.ipv4 = %s/%d\n",
-                                       buf, i->prefix);
+                               fprintf(fout, "/%d", i->prefix);
+
+                       if (i->bcast.s_addr != (i->addr.s_addr |
+                           htonl(INADDR_BROADCAST >>  i->prefix))) {
+
+                               inet_ntop(AF_INET, &i->bcast, buf, sizeof(buf));
+                               fprintf(fout, " %s\n", buf);
+                       }
                        else
-                               fprintf(fout, "lxc.network.ipv4 = %s\n", buf);
+                               fprintf(fout, "\n");
                }
                if (n->ipv6_gateway_auto)
                        fprintf(fout, "lxc.network.ipv6.gateway = auto\n");