Include port number in the hash server selection algorithm when -r (r…

…oundrobin) is specified
UlricE · Oct 12, 2015 · 2f345d7 · 2f345d7
1 parent ad993ba
commit 2f345d7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/client.c b/client.c
@@ -84,10 +84,6 @@ int store_client(struct sockaddr_storage *cli)
 	clients[i].addr = *cli;
 	clients[i].connects++;
 
-	/* don't remember server */
-	if(server_alg & ALG_HASH_NO_SERVER) {
-		clients[i].server = NO_SERVER;
-	}
 
 	DEBUG(2, "Client %s has index %d", pen_ntoa(cli), i);
 

diff --git a/pen.c b/pen.c
@@ -2415,9 +2415,6 @@ static int options(int argc, char **argv)
 			}
 			break;
 #endif  /* HAVE_LIBSSL */
-		case 'N':
-			server_alg |= ALG_HASH_NO_SERVER;
-			break;
 		case '?':
 		default:
 			usage();

diff --git a/server.c b/server.c
@@ -51,7 +51,11 @@ static int pen_hash(struct sockaddr_storage *a)
 	switch (a->ss_family) {
 	case AF_INET:
 		si = (struct sockaddr_in *)a;
-		hash = (si->sin_addr.s_addr ^ si->sin_port) % nservers;
+		if (server_alg & ALG_ROUNDROBIN) {
+			hash = (si->sin_addr.s_addr ^ si->sin_port) % nservers;
+		} else {
+			hash = si->sin_addr.s_addr % nservers;
+		}
 
 		DEBUG(2, "Hash: %d", hash);
 
@@ -206,7 +210,7 @@ int initial_server(int conn)
 	}
 	if (server_alg & ALG_PRIO) return server_by_prio();
 	if (server_alg & ALG_WEIGHT) return server_by_weight();
-	if (server_alg & ALG_HASH || server_alg & ALG_HASH_NO_SERVER) return pen_hash(&clients[conns[conn].client].addr);
+	if (server_alg & ALG_HASH) return pen_hash(&clients[conns[conn].client].addr);
 	return server_by_roundrobin();
 }
 

diff --git a/server.h b/server.h
@@ -11,7 +11,6 @@
 #define ALG_PRIO 8
 #define ALG_HASH 16
 #define ALG_STUBBORN 32
-#define ALG_HASH_NO_SERVER 64
 
 #define EMERGENCY_SERVER (-1)
 #define ABUSE_SERVER (-2)