From 379a40285050ef196c6320079e5f596850050917 Mon Sep 17 00:00:00 2001 From: Vasileios Kotronis Date: Thu, 21 Dec 2023 18:04:53 +0200 Subject: [PATCH] fixing small issue with netmask implementation --- endpoints/routes.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/endpoints/routes.go b/endpoints/routes.go index 4188da1..4d7a93d 100644 --- a/endpoints/routes.go +++ b/endpoints/routes.go @@ -132,16 +132,16 @@ func RouteNetMask(r *http.Request, ps httprouter.Params, useCache bool) (bird.Pa return bird.Parsed{"error": fmt.Sprintf("%s", err)}, false } - return bird.RoutesLookupTable(useCache, net, "master") -} - -func RouteNetTable(r *http.Request, ps httprouter.Params, useCache bool) (bird.Parsed, bool) { - net, err := ValidatePrefixParam(ps.ByName("net")) + mask, err := ValidateNetMaskParam(ps.ByName("mask")) if err != nil { return bird.Parsed{"error": fmt.Sprintf("%s", err)}, false } - mask, err := ValidateNetMaskParam(ps.ByName("mask")) + return bird.RoutesLookupTable(useCache, net+"/"+mask, "master") +} + +func RouteNetTable(r *http.Request, ps httprouter.Params, useCache bool) (bird.Parsed, bool) { + net, err := ValidatePrefixParam(ps.ByName("net")) if err != nil { return bird.Parsed{"error": fmt.Sprintf("%s", err)}, false } @@ -151,7 +151,7 @@ func RouteNetTable(r *http.Request, ps httprouter.Params, useCache bool) (bird.P return bird.Parsed{"error": fmt.Sprintf("%s", err)}, false } - return bird.RoutesLookupTable(useCache, net+"/"+mask, table) + return bird.RoutesLookupTable(useCache, net, table) } func RouteNetMaskTable(r *http.Request, ps httprouter.Params, useCache bool) (bird.Parsed, bool) {