X-Git-Url: http://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=prometheus.c;h=d7dd2bef03684acaf48cac2c8a1f3936905eea18;hp=a3619dbea84844729b7b71daaf41b16f3906e8e6;hb=00e9928c056e760c223f191cd9c6beb1a12dbad7;hpb=33c2a33ddc91ec1dbacce09a12d96207a5e6df22 diff --git a/prometheus.c b/prometheus.c index a3619db..d7dd2be 100644 --- a/prometheus.c +++ b/prometheus.c @@ -290,7 +290,7 @@ void get_config(char *config_filename) option("hosts",hosts); option("downstream-interfaces-list-filename",downstreamfile); option("upstream-interfaces-list-filename",upstreamfile); - option("macros-filename",upstreamfile); + option("macros-filename",macrosfile); option("ip6-prefix",ip6prefix); option("medium",medium); ioption("hall-of-fame-enable",hall_of_fame); @@ -540,7 +540,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); /*-----------------------------------------------------------------*/ printf("Parsing downstream interfaces list %s ...\n", downstreamfile); /*-----------------------------------------------------------------*/ - parse(upstreamfile) + parse(downstreamfile) { ptr = parse_datafile_line(_); if(ptr)