Merge branch 'fdn-mods'

[l2tpns.git] / l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index b2b0513..0721f5c 100644 (file)
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -4,8 +4,6 @@
 // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8
 
-char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.176 2011/01/20 12:48:40 bodea Exp $";
-
 #include <arpa/inet.h>
 #include <assert.h>
 #include <errno.h>
@@ -1976,11 +1974,11 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
                {
                        // This session was part of a bundle
                        bundle[b].num_of_links--;
-                       LOG(3, s, 0, "MPPP: Dropping member link: %d from bundle %d\n",s,b);
+                       LOG(3, s, session[s].tunnel, "MPPP: Dropping member link: %d from bundle %d\n",s,b);
                        if(bundle[b].num_of_links == 0) 
                        {
                                bundleclear(b);
-                               LOG(3, s, 0, "MPPP: Kill bundle: %d (No remaing member links)\n",b);
+                               LOG(3, s, session[s].tunnel, "MPPP: Kill bundle: %d (No remaing member links)\n",b);
                        }
                        else 
                        {
@@ -1997,7 +1995,7 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
                                                        break;
                                                }
                                        bundle[b].members[mem_num] = bundle[b].members[bundle[b].num_of_links];
-                                       LOG(3, s, 0, "MPPP: Adjusted member links array\n");
+                                       LOG(3, s, session[s].tunnel, "MPPP: Adjusted member links array\n");
                                }
                        }
                        cluster_send_bundle(b);
@@ -4717,7 +4715,7 @@ int main(int argc, char *argv[])
        /* set hostname /after/ having read the config file */
        if (*config->hostname)
                strcpy(hostname, config->hostname);
-       cli_init_hostname(hostname);
+       cli_init_complete(hostname);
        update_config();
        init_tbf(config->num_tbfs);