Merge pull request #2432 from 4144/updatepackets

Update packets up to 2019-05-02

6 files changed, 96 insertions, 15 deletions

diff --git a/src/common/HPMDataCheck.h b/src/common/HPMDataCheck.h
index 02d6c9631..506881467 100644
--- a/src/common/HPMDataCheck.h
+++ b/src/common/HPMDataCheck.h
@@ -671,6 +671,7 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
 		{ "PACKET_ZC_ACK_OPEN_WRITE_MAIL", sizeof(struct PACKET_ZC_ACK_OPEN_WRITE_MAIL), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_ACK_REMOVE_ITEM_MAIL", sizeof(struct PACKET_ZC_ACK_REMOVE_ITEM_MAIL), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_ACK_REQMAKINGITEM", sizeof(struct PACKET_ZC_ACK_REQMAKINGITEM), SERVER_TYPE_MAP },
+		{ "PACKET_ZC_ACK_REQNAMEALL", sizeof(struct PACKET_ZC_ACK_REQNAMEALL), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_ACK_SCHEDULER_CASHITEM", sizeof(struct PACKET_ZC_ACK_SCHEDULER_CASHITEM), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_ACK_SCHEDULER_CASHITEM_sub", sizeof(struct PACKET_ZC_ACK_SCHEDULER_CASHITEM_sub), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_ACK_TOUSESKILL", sizeof(struct PACKET_ZC_ACK_TOUSESKILL), SERVER_TYPE_MAP },
@@ -799,7 +800,6 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
 		{ "packet_quest_update_header", sizeof(struct packet_quest_update_header), SERVER_TYPE_MAP },
 		{ "packet_quest_update_hunt", sizeof(struct packet_quest_update_hunt), SERVER_TYPE_MAP },
 		{ "packet_reqname_ack", sizeof(struct packet_reqname_ack), SERVER_TYPE_MAP },
-		{ "packet_reqnameall_ack", sizeof(struct packet_reqnameall_ack), SERVER_TYPE_MAP },
 		{ "packet_roulette_close_ack", sizeof(struct packet_roulette_close_ack), SERVER_TYPE_MAP },
 		{ "packet_roulette_generate_ack", sizeof(struct packet_roulette_generate_ack), SERVER_TYPE_MAP },
 		{ "packet_roulette_info_ack", sizeof(struct packet_roulette_info_ack), SERVER_TYPE_MAP },
diff --git a/src/common/mmo.h b/src/common/mmo.h
index a29b0f2db..aafa54008 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -856,6 +856,7 @@ struct guild_expulsion {
 	char name[NAME_LENGTH];
 	char mes[40];
 	int account_id;
+	int char_id;
 };
 
 struct guild_skill {
diff --git a/src/common/packets/packets2019_len_main.h b/src/common/packets/packets2019_len_main.h
index 79c8d3f51..f55db7cd0 100644
--- a/src/common/packets/packets2019_len_main.h
+++ b/src/common/packets/packets2019_len_main.h
@@ -3793,7 +3793,7 @@ packetLen(0x0a46, 14)  // CZ_REQ_STYLE_CHANGE
 packetLen(0x0a47, 3)  // ZC_STYLE_CHANGE_RES
 
 // Packet: 0x0a48
-packetLen(0x0a48, 2)
+packetLen(0x0a48, 2)  // CZ_STYLE_CLOSE
 
 // Packet: 0x0a49
 packetLen(0x0a49, 22)  // CZ_PRIVATE_AIRSHIP_REQUEST
@@ -3949,7 +3949,7 @@ packetLen(0x0a86, -1)
 packetLen(0x0a87, -1)
 
 // Packet: 0x0a88
-packetLen(0x0a88, 2)
+packetLen(0x0a88, 2)  // CZ_COOLDOWN_RESET
 
 // Packet: 0x0a89
 packetLen(0x0a89, 61)  // ZC_NOTIFY_OFFLINE_STORE
@@ -4210,7 +4210,7 @@ packetLen(0x0add, 24)  // ZC_ITEM_FALL_ENTRY
 packetLen(0x0ade, 6)  // ZC_OVERWEIGHT_PERCENT
 
 // Packet: 0x0adf
-packetLen(0x0adf, 58)  // ZC_ACK_REQNAME
+packetLen(0x0adf, 58)  // ZC_ACK_REQNAME_TITLE
 
 // Packet: 0x0ae0
 packetLen(0x0ae0, 30)
@@ -4426,11 +4426,28 @@ packetLen(0x0b22, 6)
 #endif
 
 // Packet: 0x0b23
-#if PACKETVER >= 20190306
+#if PACKETVER >= 20190417
+packetLen(0x0b23, 6)
+#elif PACKETVER >= 20190306
 // removed
 #elif PACKETVER >= 20190227
 packetLen(0x0b23, 10)
 #endif
 
+// Packet: 0x0b24
+#if PACKETVER >= 20190417
+packetLen(0x0b24, 6)
+#endif
+
+// Packet: 0x0b25
+#if PACKETVER >= 20190417
+packetLen(0x0b25, 6)
+#endif
+
+// Packet: 0x0b26
+#if PACKETVER >= 20190417
+packetLen(0x0b26, 18)
+#endif
+
 
 #endif /* COMMON_PACKETS2019_LEN_MAIN_H */
diff --git a/src/common/packets/packets2019_len_re.h b/src/common/packets/packets2019_len_re.h
index c43b65cd9..2f68261cd 100644
--- a/src/common/packets/packets2019_len_re.h
+++ b/src/common/packets/packets2019_len_re.h
@@ -3799,7 +3799,7 @@ packetLen(0x0a46, 14)  // CZ_REQ_STYLE_CHANGE
 packetLen(0x0a47, 3)  // ZC_STYLE_CHANGE_RES
 
 // Packet: 0x0a48
-packetLen(0x0a48, 2)
+packetLen(0x0a48, 2)  // CZ_STYLE_CLOSE
 
 // Packet: 0x0a49
 packetLen(0x0a49, 22)  // CZ_PRIVATE_AIRSHIP_REQUEST
@@ -3955,7 +3955,7 @@ packetLen(0x0a86, -1)
 packetLen(0x0a87, -1)
 
 // Packet: 0x0a88
-packetLen(0x0a88, 2)
+packetLen(0x0a88, 2)  // CZ_COOLDOWN_RESET
 
 // Packet: 0x0a89
 packetLen(0x0a89, 61)  // ZC_NOTIFY_OFFLINE_STORE
@@ -4216,7 +4216,7 @@ packetLen(0x0add, 24)  // ZC_ITEM_FALL_ENTRY
 packetLen(0x0ade, 6)  // ZC_OVERWEIGHT_PERCENT
 
 // Packet: 0x0adf
-packetLen(0x0adf, 58)  // ZC_ACK_REQNAME
+packetLen(0x0adf, 58)  // ZC_ACK_REQNAME_TITLE
 
 // Packet: 0x0ae0
 packetLen(0x0ae0, 30)
@@ -4432,11 +4432,28 @@ packetLen(0x0b22, 6)
 #endif
 
 // Packet: 0x0b23
-#if PACKETVER >= 20190306
+#if PACKETVER >= 20190417
+packetLen(0x0b23, 6)
+#elif PACKETVER >= 20190306
 // removed
 #elif PACKETVER >= 20190227
 packetLen(0x0b23, 10)
 #endif
 
+// Packet: 0x0b24
+#if PACKETVER >= 20190417
+packetLen(0x0b24, 6)
+#endif
+
+// Packet: 0x0b25
+#if PACKETVER >= 20190417
+packetLen(0x0b25, 6)
+#endif
+
+// Packet: 0x0b26
+#if PACKETVER >= 20190417
+packetLen(0x0b26, 18)
+#endif
+
 
 #endif /* COMMON_PACKETS2019_LEN_RE_H */
diff --git a/src/common/packets/packets2019_len_zero.h b/src/common/packets/packets2019_len_zero.h
index 85098505a..24abdb7bd 100644
--- a/src/common/packets/packets2019_len_zero.h
+++ b/src/common/packets/packets2019_len_zero.h
@@ -3793,7 +3793,7 @@ packetLen(0x0a46, 14)  // CZ_REQ_STYLE_CHANGE
 packetLen(0x0a47, 3)  // ZC_STYLE_CHANGE_RES
 
 // Packet: 0x0a48
-packetLen(0x0a48, 2)
+packetLen(0x0a48, 2)  // CZ_STYLE_CLOSE
 
 // Packet: 0x0a49
 packetLen(0x0a49, 22)  // CZ_PRIVATE_AIRSHIP_REQUEST
@@ -3946,10 +3946,10 @@ packetLen(0x0a85, 82)
 packetLen(0x0a86, -1)
 
 // Packet: 0x0a87
-packetLen(0x0a87, -1)
+packetLen(0x0a87, -1)  // ZC_BAN_LIST
 
 // Packet: 0x0a88
-packetLen(0x0a88, 2)
+packetLen(0x0a88, 2)  // CZ_COOLDOWN_RESET
 
 // Packet: 0x0a89
 packetLen(0x0a89, 61)  // ZC_NOTIFY_OFFLINE_STORE
@@ -4210,7 +4210,7 @@ packetLen(0x0add, 24)  // ZC_ITEM_FALL_ENTRY
 packetLen(0x0ade, 6)  // ZC_OVERWEIGHT_PERCENT
 
 // Packet: 0x0adf
-packetLen(0x0adf, 58)  // ZC_ACK_REQNAME
+packetLen(0x0adf, 58)  // ZC_ACK_REQNAME_TITLE
 
 // Packet: 0x0ae0
 packetLen(0x0ae0, 30)
@@ -4417,5 +4417,51 @@ packetLen(0x0b21, 13)
 packetLen(0x0b22, 5)
 #endif
 
+// Packet: 0x0b23
+#if PACKETVER >= 20190410
+packetLen(0x0b23, 6)
+#endif
+
+// Packet: 0x0b24
+#if PACKETVER >= 20190424
+packetLen(0x0b24, 6)
+#endif
+
+// Packet: 0x0b25
+#if PACKETVER >= 20190424
+packetLen(0x0b25, 6)
+#endif
+
+// Packet: 0x0b26
+#if PACKETVER >= 20190424
+packetLen(0x0b26, 16)
+#endif
+
+// Packet: 0x0b27
+#if PACKETVER >= 20190502
+packetLen(0x0b27, -1)
+#elif PACKETVER >= 20190424
+packetLen(0x0b27, 2)
+#endif
+
+// Packet: 0x0b28
+#if PACKETVER >= 20190502
+packetLen(0x0b28, 22)
+#elif PACKETVER >= 20190424
+packetLen(0x0b28, -1)
+#endif
+
+// Packet: 0x0b29
+#if PACKETVER >= 20190502
+packetLen(0x0b29, 6)
+#elif PACKETVER >= 20190424
+packetLen(0x0b29, 3)
+#endif
+
+// Packet: 0x0b2a
+#if PACKETVER >= 20190502
+packetLen(0x0b2a, 6)
+#endif
+
 
 #endif /* COMMON_PACKETS2019_LEN_ZERO_H */
diff --git a/src/common/socket.c b/src/common/socket.c
index dc5b06da0..8ee4f06e2 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -1856,7 +1856,7 @@ static void socket_datasync(int fd, bool send)
 			WFIFOL(fd, 4 + ( i * 4 ) ) = data_list[i].length;
 		}
 
-		WFIFOSET(fd, p_len);
+		WFIFOSET2(fd, p_len);
 	} else {
 		for( i = 0; i < alen; i++ ) {
 			if( RFIFOL(fd, 4 + (i * 4) ) != data_list[i].length ) {
@@ -1865,7 +1865,7 @@ static void socket_datasync(int fd, bool send)
 				WFIFOW(fd, 0) = 0x2b0a;
 				WFIFOW(fd, 2) = 8;
 				WFIFOL(fd, 4) = 0;
-				WFIFOSET(fd, 8);
+				WFIFOSET2(fd, 8);
 				sockt->flush(fd);
 				/* shut down */
 				ShowFatalError("Servers are out of sync! recompile from scratch (%d)\n",i);