cfg:

- Added the SemiLastValid selector!
- Added support for the Percent/PercentRoundRobin selectors
- Python support in tools/config.py
- Reworked the Group switch code.
- Fixed a bug where Jitter values supplied in the command line could only be ints.
- Fixed a bug where specifying the '-p' print arg but NOT specifiying the JSON '-j' arg causes JSON output still instead of the standard string output.
pipe:
- Removed some code that cause a double 'CloseHandle' call when closing the Pipe Listener on Windows.

Author: iDigitalFlame

c2/cfg/convert.go

@@ -37,11 +37,11 @@ func (c Config) next(i int) int {
 	switch cBit(c[i]) {
 	case WrapHex, WrapZlib, WrapGzip, WrapBase64:
 		fallthrough
-	case SelectorLastValid, SelectorRoundRobin, SelectorRandom, SelectorSemiRandom, SelectorSemiRoundRobin:
+	case SelectorLastValid, SelectorRoundRobin, SelectorRandom, SelectorSemiRandom, SelectorSemiRoundRobin, SelectorSemiLastValid:
 		fallthrough
 	case Separator, ConnectTCP, ConnectTLS, ConnectUDP, ConnectICMP, ConnectPipe, ConnectTLSNoVerify, TransformB64:
 		return i + 1
-	case valIP, valB64Shift, valJitter, valWeight, valTLSx:
+	case valIP, valB64Shift, valJitter, valWeight, valTLSx, valSelectorPercent, valSelectorPercentRoundRobin:
 		return i + 2
 	case valCBK, valWorkHours:
 		return i + 6
@@ -233,6 +233,10 @@ loop:
 			if i+1 >= n {
 				return -1, xerr.Wrap("weight", ErrInvalidSetting)
 			}
+		case valSelectorPercent, valSelectorPercentRoundRobin:
+			if i+1 >= n {
+				return -1, xerr.Wrap("select-precent", ErrInvalidSetting)
+			}
 		case valKillDate:
 			if i+8 >= n {
 				return -1, xerr.Wrap("killdate", ErrInvalidSetting)
@@ -244,7 +248,7 @@ loop:
 			if c[i+2] > 23 || c[i+3] > 59 || c[i+4] > 23 || c[i+5] > 59 {
 				return -1, xerr.Wrap("workhours", ErrInvalidSetting)
 			}
-		case SelectorRoundRobin, SelectorLastValid, SelectorRandom, SelectorSemiRandom, SelectorSemiRoundRobin:
+		case SelectorRoundRobin, SelectorLastValid, SelectorRandom, SelectorSemiRandom, SelectorSemiRoundRobin, SelectorSemiLastValid:
 		case ConnectTCP, ConnectTLS, ConnectUDP, ConnectICMP, ConnectPipe, ConnectTLSNoVerify:
 			if p {
 				return -1, ErrMultipleConnections
@@ -474,8 +478,8 @@ loop:
 			} else {
 				p.work = &WorkHours{Days: c[i+1], StartHour: c[i+2], StartMin: c[i+3], EndHour: c[i+4], EndMin: c[i+5]}
 			}
-		case SelectorRandom, SelectorRoundRobin, SelectorLastValid, SelectorSemiRandom, SelectorSemiRoundRobin:
-			z = int8(c[i] - byte(SelectorLastValid))
+		case SelectorRandom, SelectorRoundRobin, SelectorLastValid, SelectorSemiRandom, SelectorSemiRoundRobin, SelectorSemiLastValid:
+			z = int8(c[i])
 		case ConnectTCP:
 			if p.conn != nil {
 				return nil, -1, -1, xerr.Wrap("tcp", ErrMultipleConnections)

c2/cfg/group.go

@@ -66,6 +66,19 @@ const (
 	// Takes effect only if there are multiple Groups in this Config.
 	// This value is GLOBAL and can be present in any Group!
 	SelectorSemiRandom = cBit(0xAE)
+	// SelectorSemiLastValid is a selection that will keep using the last
+	// Group unless it fails or a random precentage threashold is met (25%).
+	// On a failure, the first call or a random change, this will act similar to
+	// 'SelectorRoundRobin'.
+	//
+	// Takes effect only if there are multiple Groups in this Config.
+	// This value is GLOBAL and can be present in any Group!
+	SelectorSemiLastValid = cBit(0xA7)
+)
+
+const (
+	valSelectorPercent           = cBit(0xA8)
+	valSelectorPercentRoundRobin = cBit(0xA9)
 )
 
 // Group is a struct that allows for using multiple connections for a single
@@ -153,25 +166,33 @@ func (g *Group) Less(i, j int) bool {
 //
 // Static Profile variants may always return 'false' to prevent allocations.
 func (g *Group) Switch(e bool) bool {
-	if (g.cur != nil && !e && g.sel == 0) || len(g.entries) == 0 {
-		return false
-	}
-	if g.sel == 0 && !e && g.cur != nil { // redundent?
+	// NOTE(dij): Rust sets the first Group on creation, but Go does not, so
+	//            if g.cur == nil, it means we haven't set it yet.
+	if len(g.entries) == 0 {
 		return false
 	}
-	if g.cur != nil && (g.sel == 3 || g.sel == 4) && util.FastRandN(4) != 0 {
-		return false
+	if g.cur != nil {
+		if !e && g.sel == uint8(SelectorLastValid) {
+			return false
+		}
+		if !e && g.sel == uint8(SelectorSemiLastValid) && util.FastRandN(4) != 0 {
+			return false
+		}
+		if (g.sel == uint8(SelectorSemiRandom) || g.sel == uint8(SelectorSemiRoundRobin)) && util.FastRandN(4) != 0 {
+			return false
+		}
+		// selectorPercent stuff here.
 	}
-	if g.lock.Lock(); g.sel == 2 || g.sel == 4 {
+	switch g.lock.Lock(); {
+	case g.sel == uint8(SelectorRandom) || g.sel == uint8(SelectorSemiRandom):
 		if n := g.entries[util.FastRandN(len(g.entries))]; g.cur != n {
 			g.cur = n
 			g.lock.Unlock()
 			return true
 		}
 		g.lock.Unlock()
 		return false
-	}
-	if g.cur == nil {
+	case g.cur == nil:
 		g.cur = g.entries[0]
 		g.lock.Unlock()
 		return true

c2/cfg/z_json.go

@@ -19,6 +19,8 @@
 
 package cfg
 
+// NOTE(dij): Deprecation Planned!
+
 import (
 	"encoding/base64"
 	"encoding/json"
@@ -65,6 +67,12 @@ func (c cBit) String() string {
 		return "select-semi-round-robin"
 	case SelectorSemiRandom:
 		return "select-semi-random"
+	case SelectorSemiLastValid:
+		return "select-semi-last"
+	case valSelectorPercent:
+		return "select-percent"
+	case valSelectorPercentRoundRobin:
+		return "select-percent-round-robin"
 	case ConnectTCP:
 		return "tcp"
 	case ConnectTLS:
@@ -138,6 +146,12 @@ func bitFromName(s string) cBit {
 		return SelectorSemiRoundRobin
 	case "select-semi-random":
 		return SelectorSemiRandom
+	case "select-semi-last":
+		return SelectorSemiLastValid
+	case "select-percent":
+		return valSelectorPercent
+	case "select-percent-round-robin":
+		return valSelectorPercentRoundRobin
 	case "tcp":
 		return ConnectTCP
 	case "tls":
@@ -285,7 +299,7 @@ func (c Config) MarshalJSON() ([]byte, error) {
 		switch z = false; x {
 		case WrapHex, WrapZlib, WrapGzip, WrapBase64:
 			fallthrough
-		case SelectorLastValid, SelectorRoundRobin, SelectorRandom, SelectorSemiRandom, SelectorSemiRoundRobin:
+		case SelectorLastValid, SelectorRoundRobin, SelectorRandom, SelectorSemiRandom, SelectorSemiRoundRobin, SelectorSemiLastValid:
 			fallthrough
 		case ConnectTCP, ConnectTLS, ConnectUDP, ConnectICMP, ConnectPipe, ConnectTLSNoVerify:
 			fallthrough
@@ -341,7 +355,7 @@ func (c Config) MarshalJSON() ([]byte, error) {
 				)
 			}
 			b.WriteByte('}')
-		case valJitter, valWeight, valIP, valTLSx, valB64Shift:
+		case valJitter, valWeight, valIP, valTLSx, valB64Shift, valSelectorPercent, valSelectorPercentRoundRobin:
 			if i+1 >= n {
 				return nil, ErrInvalidSetting
 			}
@@ -570,7 +584,7 @@ func (c *Config) UnmarshalJSON(b []byte) error {
 				return ErrInvalidSetting
 			case WrapHex, WrapZlib, WrapGzip, WrapBase64:
 				fallthrough
-			case SelectorLastValid, SelectorRoundRobin, SelectorRandom, SelectorSemiRandom, SelectorSemiRoundRobin:
+			case SelectorLastValid, SelectorRoundRobin, SelectorRandom, SelectorSemiRandom, SelectorSemiRoundRobin, SelectorSemiLastValid:
 				fallthrough
 			case ConnectTCP, ConnectTLS, ConnectUDP, ConnectICMP, ConnectPipe, ConnectTLSNoVerify:
 				fallthrough
@@ -632,6 +646,18 @@ func (c *Config) UnmarshalJSON(b []byte) error {
 						byte(v >> 24), byte(v >> 16), byte(v >> 8), byte(v),
 					})
 				}
+			case valSelectorPercent:
+				var v uint8
+				if err := json.Unmarshal(m[i].Args, &v); err != nil {
+					return xerr.Wrap("selector-percent", err)
+				}
+				r = append(r, cBytes{byte(valSelectorPercent), v})
+			case valSelectorPercentRoundRobin:
+				var v uint8
+				if err := json.Unmarshal(m[i].Args, &v); err != nil {
+					return xerr.Wrap("selector-percent-round-robin", err)
+				}
+				r = append(r, cBytes{byte(valSelectorPercentRoundRobin), v})
 			case valWorkHours:
 				var z mapper
 				if err := json.Unmarshal(m[i].Args, &z); err != nil {

com/pipe/pipe_windows.go

@@ -133,11 +133,6 @@ func (l *Listener) Close() error {
 				bugtrack.Track("com.(*Listener).Close(): CancelIoEx error: %s!", err.Error())
 			}
 		}
-		if err = winapi.CloseHandle(l.overlap.Event); err != nil {
-			if bugtrack.Enabled {
-				bugtrack.Track("com.(*Listener).Close(): CloseHandle(event) error: %s!", err.Error())
-			}
-		}
 		if l.active > 0 { // Extra check as it can be reset here sometimes.
 			if err = winapi.CloseHandle(l.active); err != nil {
 				if bugtrack.Enabled {