From eed3795f145b4eae0bbfb2464177b3289dd9720e Mon Sep 17 00:00:00 2001
From: Lars Lehtonen <lars.lehtonen@gmail.com>
Date: Mon, 25 Nov 2019 03:28:47 -0800
Subject: [PATCH] session: SessionModule.DecParam() swap error returns

modules: fix calling functions to reflect swapped error returns
---
 modules/events_stream/events_stream.go | 2 +-
 modules/net_sniff/net_sniff_fuzz.go    | 4 ++--
 session/module.go                      | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/events_stream/events_stream.go b/modules/events_stream/events_stream.go
index d5d444d7..29f9616b 100644
--- a/modules/events_stream/events_stream.go
+++ b/modules/events_stream/events_stream.go
@@ -258,7 +258,7 @@ func (mod *EventsStream) Configure() (err error) {
 		return err
 	} else if err, mod.rotation.How = mod.StringParam("events.stream.output.rotate.how"); err != nil {
 		return err
-	} else if err, mod.rotation.Period = mod.DecParam("events.stream.output.rotate.when"); err != nil {
+	} else if mod.rotation.Period, err = mod.DecParam("events.stream.output.rotate.when"); err != nil {
 		return err
 	}
 
diff --git a/modules/net_sniff/net_sniff_fuzz.go b/modules/net_sniff/net_sniff_fuzz.go
index 6b3f26b4..05d7db17 100644
--- a/modules/net_sniff/net_sniff_fuzz.go
+++ b/modules/net_sniff/net_sniff_fuzz.go
@@ -77,11 +77,11 @@ func (mod *Sniffer) configureFuzzing() (err error) {
 		mod.fuzzLayers = str.Comma(layers)
 	}
 
-	if err, mod.fuzzRate = mod.DecParam("net.fuzz.rate"); err != nil {
+	if mod.fuzzRate, err = mod.DecParam("net.fuzz.rate"); err != nil {
 		return
 	}
 
-	if err, mod.fuzzRatio = mod.DecParam("net.fuzz.ratio"); err != nil {
+	if mod.fuzzRatio, err = mod.DecParam("net.fuzz.ratio"); err != nil {
 		return
 	}
 
diff --git a/session/module.go b/session/module.go
index 41778c4b..a57d3b06 100644
--- a/session/module.go
+++ b/session/module.go
@@ -202,16 +202,16 @@ func (m SessionModule) IntParam(name string) (error, int) {
 	}
 }
 
-func (m SessionModule) DecParam(name string) (error, float64) {
+func (m SessionModule) DecParam(name string) (float64, error) {
 	if p, found := m.params[name]; found {
 		if v, err := p.Get(m.Session); err != nil {
-			return err, 0
+			return 0, err
 		} else {
-			return nil, v.(float64)
+			return v.(float64), err
 		}
 
 	} else {
-		return fmt.Errorf("Parameter %s does not exist.", name), 0
+		return 0, fmt.Errorf("Parameter %s does not exist.", name)
 	}
 }