Merge pull request #3247 from 4144/fixes

Different small fixes
HerculesWS · Nov 19, 2023 · 9119653 · 9119653
2 parents 7d6b0b2 + 194dce6
commit 9119653
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/map/clif.c b/src/map/clif.c
@@ -26159,8 +26159,17 @@ static int clif_parse(int fd)
 			}
 		}
 
-		if ((int)RFIFOREST(fd) < packet_len)
+		if ((int)RFIFOREST(fd) < packet_len) {
+			if (sd == NULL) {
+				if (packet_db[cmd].func != clif->pWantToConnection) {
+					ShowWarning("clif_parse: Received first unsupported packet (packet 0x%04x (0x%04x), %"PRIuS" bytes received), disconnecting session #%d.\n",
+				            (unsigned int)cmd, RFIFOW(fd, 0), RFIFOREST(fd), fd);
+					sockt->eof(fd);
+				}
+			}
+
 			return 0; // not enough data received to form the packet
+		}
 
 		if( battle_config.packet_obfuscation == 2 || cmd != RFIFOW(fd, 0) || (sd && sd->parse_cmd_func == clif->parse_cmd_decrypt) ) {
 			// Note: Overriding const qualifier to re-inject the decoded packet ID.

diff --git a/tools/ci/travis.sh b/tools/ci/travis.sh
@@ -52,7 +52,7 @@ function run_server {
 	rm -rf core* || true
 	CRASH_PLEASE=1 $1 --run-once $2 2>runlog.txt
 	export errcode=$?
-	export teststr=$(head -c 10000 runlog.txt)
+	export teststr=$(head -c 10000 runlog.txt|grep -v "WARNING: MYSQL_OPT_RECONNECT is deprecated and will be removed in a future version.")
 	if [[ -n "${teststr}" ]]; then
 		echo "Errors found in running server $1."
 		head -c 10000 runlog.txt