diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-06-18 23:22:20 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-06-18 23:22:20 +0000 |
| commit | 64ab9be453f31b55e35ad5cad8102a9e45244a8c (patch) | |
| tree | 406e428023ed2124a776f7a0bdb6719f3ddc0f14 /avahi-core | |
| parent | 768d6a386735d3a0805547a2de728886f2aa8798 (diff) | |
* fix memory handling when reading configuration files
* implement signal handling in daemon
* correctly increase reference counter for main contexts when running g_main_context_default()
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@128 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-core')
| -rw-r--r-- | avahi-core/netlink.c | 4 | ||||
| -rw-r--r-- | avahi-core/server.c | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/avahi-core/netlink.c b/avahi-core/netlink.c index 50ddf5c..ff88b91 100644 --- a/avahi-core/netlink.c +++ b/avahi-core/netlink.c @@ -120,7 +120,6 @@ AvahiNetlink *avahi_netlink_new(GMainContext *context, gint priority, guint32 gr NULL }; - g_assert(context); g_assert(cb); if ((fd = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE)) < 0) { @@ -140,8 +139,7 @@ AvahiNetlink *avahi_netlink_new(GMainContext *context, gint priority, guint32 gr } nl = g_new(AvahiNetlink, 1); - nl->context = context; - g_main_context_ref(context); + g_main_context_ref(nl->context = context ? context : g_main_context_default()); nl->fd = fd; nl->seq = 0; nl->callback = cb; diff --git a/avahi-core/server.c b/avahi-core/server.c index 0c00658..d03a284 100644 --- a/avahi-core/server.c +++ b/avahi-core/server.c @@ -1275,10 +1275,7 @@ AvahiServer *avahi_server_new(GMainContext *c, const AvahiServerConfig *sc, Avah s->fd_legacy_unicast_ipv4 = s->fd_ipv4 >= 0 && s->config.enable_reflector ? avahi_open_legacy_unicast_socket_ipv4() : -1; s->fd_legacy_unicast_ipv6 = s->fd_ipv6 >= 0 && s->config.enable_reflector ? avahi_open_legacy_unicast_socket_ipv6() : -1; - if (c) - g_main_context_ref(s->context = c); - else - s->context = g_main_context_default(); + g_main_context_ref(c->context = c ? c : g_main_context_default()); /* Prepare IO source registration */ s->source = g_source_new(&source_funcs, sizeof(GSource) + sizeof(AvahiServer*)); |