fix(hexen2): player details (#115)

Fix Hexen 2 player details by enabling next_player_info flow.

Also:
* Extract code send code into send_packet_raw and use in all send
  methods. This enables easy conversion of callers using send(...)
  to use a version which supports packet debugging.

Fixes #114

Author: stevenh

qserver.c

@@ -26,26 +26,9 @@
 query_status_t
 qserver_send_initial(struct qserver *server, const char *data, size_t len)
 {
-	int status = INPROGRESS;
+	query_status_t status;
 
-	if (data) {
-		int ret;
-		debug(2, "[%s] send", server->type->type_prefix);
-		if (4 <= get_debug_level()) {
-			output_packet(server, data, len, 1);
-		}
-
-		if (server->flags & FLAG_BROADCAST) {
-			ret = send_broadcast(server, data, len);
-		} else {
-			ret = send(server->fd, data, len, 0);
-		}
-
-		if (ret == SOCKET_ERROR) {
-			send_error(server, ret);
-			status = SYS_ERROR;
-		}
-	}
+	status = send_packet_raw(server, data, len);
 
 	if ((server->retry1 == n_retries) || server->flags & FLAG_BROADCAST) {
 		gettimeofday(&server->packet_time1, NULL);
@@ -59,25 +42,12 @@ qserver_send_initial(struct qserver *server, const char *data, size_t len)
 	return (status);
 }
 
-
 query_status_t
 qserver_send(struct qserver *server, const char *data, size_t len)
 {
-	int status = INPROGRESS;
+	query_status_t status;
 
-	if (data) {
-		int ret;
-		if (server->flags & FLAG_BROADCAST) {
-			ret = send_broadcast(server, data, len);
-		} else {
-			ret = send(server->fd, data, len, 0);
-		}
-
-		if (ret == SOCKET_ERROR) {
-			send_error(server, ret);
-			status = SYS_ERROR;
-		}
-	}
+	status = send_packet_raw(server, data, len);
 
 	server->retry1 = n_retries - 1;
 	gettimeofday(&server->packet_time1, NULL);
@@ -87,7 +57,6 @@ qserver_send(struct qserver *server, const char *data, size_t len)
 	return (status);
 }
 
-
 int
 send_broadcast(struct qserver *server, const char *pkt, size_t pktlen)
 {
@@ -105,7 +74,6 @@ send_broadcast(struct qserver *server, const char *pkt, size_t pktlen)
 	return (sendto(server->fd, (const char *)pkt, pktlen, 0, (struct sockaddr *)&addr, sizeof(addr)));
 }
 
-
 int
 register_send(struct qserver *server)
 {
@@ -124,9 +92,8 @@ register_send(struct qserver *server)
 	return (INPROGRESS);
 }
 
-
 query_status_t
-send_packet(struct qserver *server, const char *data, size_t len)
+send_packet_raw(struct qserver *server, const char *data, size_t len)
 {
 	debug(2, "[%s] send", server->type->type_prefix);
 	if (4 <= get_debug_level()) {
@@ -146,11 +113,21 @@ send_packet(struct qserver *server, const char *data, size_t len)
 		}
 	}
 
-	register_send(server);
-
 	return (INPROGRESS);
 }
 
+query_status_t
+send_packet(struct qserver *server, const char *data, size_t len)
+{
+	query_status_t rc;
+
+	rc = send_packet_raw(server, data, len);
+	if (rc == SYS_ERROR) {
+		return (rc);
+	}
+
+	return (register_send(server));
+}
 
 query_status_t
 send_error(struct qserver *server, int rc)
@@ -164,6 +141,6 @@ send_error(struct qserver *server, int rc)
 	    (ipaddr >> 8) & 0xff,
 	    ipaddr & 0xff,
 	    errstr
-	    );
+	);
 	return (SYS_ERROR);
 }

qserver.h

@@ -219,6 +219,11 @@ int register_send(struct qserver *server);
  */
 query_status_t send_packet(struct qserver *server, const char *data, size_t len);
 
+/**
+ * Sends a packet to the server either direct or via broadcast.
+ */
+query_status_t send_packet_raw(struct qserver *server, const char *data, size_t len);
+
 /**
  * Logs the error from a socket send
  */

qstat.c

@@ -3206,9 +3206,9 @@ do_work(void)
 			}
 
 #ifdef ENABLE_DUMP
-				if (do_dump) {
-					dump_packet(pkt, pktlen);
-				}
+			if (do_dump) {
+				dump_packet(pkt, pktlen);
+			}
 #endif
 			if (server->flags & FLAG_BROADCAST) {
 				struct qserver *broadcast = server;
@@ -5581,7 +5581,7 @@ send_rule_request_packet(struct qserver *server)
 query_status_t
 send_player_request_packet(struct qserver *server)
 {
-	int rc;
+	query_status_t rc;
 
 	debug(3, "send_player_request_packet %p", server);
 
@@ -5605,12 +5605,15 @@ send_player_request_packet(struct qserver *server)
 		return (0);
 	}
 
-	if (server->type->id == Q_SERVER) {
+	switch (server->type->id) {
+	case Q_SERVER:
+	case H2_SERVER:
 		q_player.data[0] = server->next_player_info;
 	}
-	rc = send(server->fd, (const char *)server->type->player_packet, server->type->player_len, 0);
-	if (rc == SOCKET_ERROR) {
-		return (send_error(server, rc));
+
+	rc = send_packet_raw(server, (const char *)server->type->player_packet, server->type->player_len);
+	if (rc < INPROGRESS) {
+		return (rc);
 	}
 
 setup_retry:
@@ -5623,7 +5626,7 @@ send_player_request_packet(struct qserver *server)
 	server->retry2--;
 	server->n_packets++;
 
-	return (1);
+	return (DONE_AUTO);
 }