Nexthop calculation should always use the shortest path.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index 53f91e8..7416d11 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -1,7 +1,7 @@
 /*
     tincd.c -- the main file for tincd
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
                   2008      Max Rijevski <maksuf@gmail.com>
                   2009      Michael Tokarev <mjt@tls.msk.ru>
                   2010      Julien Muchembled <jm@jmuchemb.eu>
@@ -178,7 +178,9 @@ static bool parse_options(int argc, char **argv) {
                                break;
 #endif
 
-                       case 'd':                               /* inc debug level */
+                       case 'd':                               /* increase debug level */
+                               if(!optarg && optind < argc && *argv[optind] != '-')
+                                       optarg = argv[optind++];
                                if(optarg)
                                        debug_level = atoi(optarg);
                                else
@@ -187,6 +189,8 @@ static bool parse_options(int argc, char **argv) {
 
                        case 'k':                               /* kill old tincds */
 #ifndef HAVE_MINGW
+                               if(!optarg && optind < argc && *argv[optind] != '-')
+                                       optarg = argv[optind++];
                                if(optarg) {
                                        if(!strcasecmp(optarg, "HUP"))
                                                kill_tincd = SIGHUP;
@@ -225,8 +229,7 @@ static bool parse_options(int argc, char **argv) {
 
                        case 'n':                               /* net name given */
                                /* netname "." is special: a "top-level name" */
-                               netname = strcmp(optarg, ".") != 0 ?
-                                               xstrdup(optarg) : NULL;
+                               netname = strcmp(optarg, ".") != 0 ? xstrdup(optarg) : NULL;
                                break;
 
                        case 'o':                               /* option */
@@ -237,6 +240,8 @@ static bool parse_options(int argc, char **argv) {
                                break;
 
                        case 'K':                               /* generate public/private keypair */
+                               if(!optarg && optind < argc && *argv[optind] != '-')
+                                       optarg = argv[optind++];
                                if(optarg) {
                                        generate_keys = atoi(optarg);
 
@@ -274,6 +279,8 @@ static bool parse_options(int argc, char **argv) {
 
                        case 4:                                 /* write log entries to a file */
                                use_logfile = true;
+                               if(!optarg && optind < argc && *argv[optind] != '-')
+                                       optarg = argv[optind++];
                                if(optarg)
                                        logfilename = xstrdup(optarg);
                                break;
@@ -291,6 +298,12 @@ static bool parse_options(int argc, char **argv) {
                }
        }
 
+       if(optind < argc) {
+               fprintf(stderr, "%s: unrecognized argument '%s'\n", argv[0], argv[optind]);
+               usage(true);
+               return false;
+       }
+
        return true;
 }
 
@@ -391,7 +404,7 @@ static void make_names(void) {
 #ifdef HAVE_MINGW
        HKEY key;
        char installdir[1024] = "";
-       long len = sizeof(installdir);
+       DWORD len = sizeof(installdir);
 #endif
 
        if(netname)
@@ -401,7 +414,7 @@ static void make_names(void) {
 
 #ifdef HAVE_MINGW
        if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
-               if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) {
+               if(!RegQueryValueEx(key, NULL, 0, 0, (LPBYTE)installdir, &len)) {
                        if(!logfilename)
                                xasprintf(&logfilename, "%s/log/%s.log", identname);
                        if(!confbase) {
@@ -513,7 +526,7 @@ int main(int argc, char **argv) {
        if(show_version) {
                printf("%s version %s (built %s %s, protocol %d)\n", PACKAGE,
                           VERSION, __DATE__, __TIME__, PROT_CURRENT);
-               printf("Copyright (C) 1998-2012 Ivo Timmermans, Guus Sliepen and others.\n"
+               printf("Copyright (C) 1998-2013 Ivo Timmermans, Guus Sliepen and others.\n"
                                "See the AUTHORS file for a complete list.\n\n"
                                "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
                                "and you are welcome to redistribute it under certain conditions;\n"