Skip to content

1.增加传输包的加密压缩功能； #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BraveLea wants to merge 3 commits into
base: master
Choose a base branch
from
Open

1.增加传输包的加密压缩功能； #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6bb122
1.增加传输包的加密压缩功能；
BraveLea Sep 1, 2017
c5f593c
Merge remote branch 'mlgoogle/master'
BraveLea Sep 1, 2017
0de577a
1.插件解码失败返回明文给客户端，客户端拉取新key;
BraveLea Sep 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion plugins/bank/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ logic_unit.o : $(USER_DIR)/logic/logic_unit.cc $(USER_DIR)/logic/logic_unit.h
star_infos.o : $(USER_DIR)/logic/star_infos.cc $(USER_DIR)/logic/star_infos.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/logic/star_infos.cc $(INCLUDE_PATHS)

packet_process_assist.o : $(USER_DIR)/net/packet_process_assist.cc $(USER_DIR)/net/packet_process_assist.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_process_assist.cc $(INCLUDE_PATHS)

packet_processing.o : $(USER_DIR)/net/packet_processing.cc $(USER_DIR)/net/packet_processing.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_processing.cc $(INCLUDE_PATHS)

Expand All @@ -120,7 +123,7 @@ redis_pool.o : $(USER_DIR)/storage/redis_pool.cc $(USER_DIR)/storage/redis_pool


$(PLUGIN) : bank_init.o bank_logic.o bank_proto_buf.o bank_db.o bank_info.o fcgimodule.o\
star_infos.o logic_unit.o packet_processing.o data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o\
star_infos.o logic_unit.o packet_process_assist.o packet_processing.o data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o\
$(CUSTOM_THIRD_PATH)/dmg_fp/lib/dmg_fp.a $(LIB_DIR)/mylib/base/lib/mybase.a $(LIB_DIR)/mylib/third_party/lib/libhiredis.a
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LINK_PATHS) -lpthread -lexpat -lrt -ldl -lmysqlclient -lfcgi++ \
$^ -o $@
Expand Down
2 changes: 1 addition & 1 deletion plugins/bank/bank_logic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ bool Banklogic::OnBankMessage(struct server *srv, const int socket,

if (!net::PacketProsess::UnpackStream(msg, len, &packet)) {
LOG_ERROR2("UnpackStream Error socket %d", socket);
send_error(socket, ERROR_TYPE, ERROR_TYPE, FORMAT_ERRNO);
SEND_UNPACKET_ERROR(socket, ERROR_TYPE, UNPACKET_ERRNO, FORMAT_ERRNO);
return false;
}

Expand Down
4 changes: 2 additions & 2 deletions plugins/base.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ CPPFLAGS=
CC=g++
MAKE=gmake
#星云
#PROJECT="STAR_CLOUD"
PROJECT="STAR_CLOUD"
#默认星享
PROJECT=""
#PROJECT=""



Expand Down
5 changes: 4 additions & 1 deletion plugins/circle/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ logic_unit.o : $(USER_DIR)/logic/logic_unit.cc $(USER_DIR)/logic/logic_unit.h
star_infos.o : $(USER_DIR)/logic/star_infos.cc $(USER_DIR)/logic/star_infos.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/logic/star_infos.cc $(INCLUDE_PATHS)

packet_process_assist.o : $(USER_DIR)/net/packet_process_assist.cc $(USER_DIR)/net/packet_process_assist.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_process_assist.cc $(INCLUDE_PATHS)

packet_processing.o : $(USER_DIR)/net/packet_processing.cc $(USER_DIR)/net/packet_processing.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_processing.cc $(INCLUDE_PATHS)

Expand All @@ -99,7 +102,7 @@ time.o : $(USER_DIR)/logic/time.cc $(USER_DIR)/logic/time.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/logic/time.cc $(INCLUDE_PATHS)

$(PLUGIN) : circle_init.o circle_logic.o circle_db.o circle_info.o schduler_engine.o kafka.o \
star_infos.o logic_unit.o packet_processing.o data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o\
star_infos.o logic_unit.o packet_process_assist.o packet_processing.o data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o\
$(CUSTOM_THIRD_PATH)/dmg_fp/lib/dmg_fp.a $(LIB_DIR)/mylib/base/lib/mybase.a \
$(LIB_DIR)/mylib/third_party/lib/libhiredis.a $(CUSTOM_THIRD_PATH)/librdkafka/librdkafka.a
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LINK_PATHS) -lpthread -lexpat -lrt -ldl -liconv -lmysqlclient -lqiniu \
Expand Down
1 change: 1 addition & 0 deletions plugins/circle/circle_logic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ bool Circlelogic::OnCircleMessage(struct server *srv, const int socket,
if (!net::PacketProsess::UnpackStream(msg, len, &packet))
{
LOG_ERROR2("UnpackStream Error socket %d", socket);
SEND_UNPACKET_ERROR(socket, ERROR_TYPE, UNPACKET_ERRNO, FORMAT_ERRNO);
return false;
}

Expand Down
5 changes: 4 additions & 1 deletion plugins/comments/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ logic_unit.o : $(USER_DIR)/logic/logic_unit.cc $(USER_DIR)/logic/logic_unit.h
star_infos.o : $(USER_DIR)/logic/star_infos.cc $(USER_DIR)/logic/star_infos.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/logic/star_infos.cc $(INCLUDE_PATHS)

packet_process_assist.o : $(USER_DIR)/net/packet_process_assist.cc $(USER_DIR)/net/packet_process_assist.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_process_assist.cc $(INCLUDE_PATHS)

packet_processing.o : $(USER_DIR)/net/packet_processing.cc $(USER_DIR)/net/packet_processing.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_processing.cc $(INCLUDE_PATHS)

Expand All @@ -117,7 +120,7 @@ xml_parser.o : $(USER_DIR)/logic/xml_parser.cc $(USER_DIR)/logic/xml_parser.h


$(PLUGIN) : comments_init.o comments_logic.o schduler_engine.o comments_proto_buf.o comments_redis.o\
star_infos.o logic_unit.o packet_processing.o data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o\
star_infos.o logic_unit.o packet_process_assist.o packet_processing.o data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o\
$(CUSTOM_THIRD_PATH)/dmg_fp/lib/dmg_fp.a $(LIB_DIR)/mylib/base/lib/mybase.a $(LIB_DIR)/mylib/third_party/lib/libhiredis.a
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LINK_PATHS) -lpthread -lexpat -lrt -ldl -lmysqlclient \
$^ -o $@
Expand Down
2 changes: 1 addition & 1 deletion plugins/comments/comments_logic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ bool Commentslogic::OnCommentsMessage(struct server *srv, const int socket,

if (!net::PacketProsess::UnpackStream(msg, len, &packet)) {
LOG_ERROR2("UnpackStream Error socket %d", socket);
send_error(socket, ERROR_TYPE, ERROR_TYPE, FORMAT_ERRNO);
SEND_UNPACKET_ERROR(socket, ERROR_TYPE, UNPACKET_ERRNO, FORMAT_ERRNO);
return false;
}

Expand Down
5 changes: 4 additions & 1 deletion plugins/flashsale/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ logic_unit.o : $(USER_DIR)/logic/logic_unit.cc $(USER_DIR)/logic/logic_unit.h
star_infos.o : $(USER_DIR)/logic/star_infos.cc $(USER_DIR)/logic/star_infos.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/logic/star_infos.cc $(INCLUDE_PATHS)

packet_process_assist.o : $(USER_DIR)/net/packet_process_assist.cc $(USER_DIR)/net/packet_process_assist.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_process_assist.cc $(INCLUDE_PATHS)

packet_processing.o : $(USER_DIR)/net/packet_processing.cc $(USER_DIR)/net/packet_processing.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_processing.cc $(INCLUDE_PATHS)

Expand All @@ -126,7 +129,7 @@ time.o : $(USER_DIR)/logic/time.cc $(USER_DIR)/logic/time.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/logic/time.cc $(INCLUDE_PATHS)

$(PLUGIN) : flash_init.o flash_logic.o flash_db.o share_memory.o flash_info.o flash_kafka.o schduler_engine.o \
star_infos.o time.o logic_unit.o packet_processing.o data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o\
star_infos.o time.o logic_unit.o packet_process_assist.o packet_processing.o data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o\
$(CUSTOM_THIRD_PATH)/dmg_fp/lib/dmg_fp.a $(LIB_DIR)/mylib/base/lib/mybase.a $(LIB_DIR)/mylib/third_party/lib/libhiredis.a $(CUSTOM_THIRD_PATH)/librdkafka/librdkafka.a
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LINK_PATHS) -lpthread -lexpat -lrt -ldl -lmysqlclient \
$^ -o $@
Expand Down
1 change: 1 addition & 0 deletions plugins/flashsale/flash_logic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ bool Flashlogic::OnFlashMessage(struct server *srv, const int socket,
if (!net::PacketProsess::UnpackStream(msg, len, &packet))
{
LOG_ERROR2("UnpackStream Error socket %d", socket);
SEND_UNPACKET_ERROR(socket, ERROR_TYPE, UNPACKET_ERRNO, FORMAT_ERRNO);
return false;
}

Expand Down
5 changes: 4 additions & 1 deletion plugins/history/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ logic_unit.o : $(USER_DIR)/logic/logic_unit.cc $(USER_DIR)/logic/logic_unit.h
star_infos.o : $(USER_DIR)/logic/star_infos.cc $(USER_DIR)/logic/star_infos.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/logic/star_infos.cc $(INCLUDE_PATHS)

packet_process_assist.o : $(USER_DIR)/net/packet_process_assist.cc $(USER_DIR)/net/packet_process_assist.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_process_assist.cc $(INCLUDE_PATHS)

packet_processing.o : $(USER_DIR)/net/packet_processing.cc $(USER_DIR)/net/packet_processing.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_processing.cc $(INCLUDE_PATHS)

Expand All @@ -120,7 +123,7 @@ redis_pool.o : $(USER_DIR)/storage/redis_pool.cc $(USER_DIR)/storage/redis_pool


$(PLUGIN) : history_init.o history_logic.o schduler_engine.o history_proto_buf.o history_db.o history_info.o fcgimodule.o\
star_infos.o logic_unit.o packet_processing.o data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o\
star_infos.o logic_unit.o packet_process_assist.o packet_processing.o data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o\
$(CUSTOM_THIRD_PATH)/dmg_fp/lib/dmg_fp.a $(LIB_DIR)/mylib/base/lib/mybase.a $(LIB_DIR)/mylib/third_party/lib/libhiredis.a
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LINK_PATHS) -lpthread -lexpat -lrt -ldl -lmysqlclient -lfcgi++ \
$^ -o $@
Expand Down
2 changes: 1 addition & 1 deletion plugins/history/history_logic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ bool Historylogic::OnHistoryMessage(struct server *srv, const int socket,

if (!net::PacketProsess::UnpackStream(msg, len, &packet)) {
LOG_ERROR2("UnpackStream Error socket %d", socket);
send_error(socket, ERROR_TYPE, ERROR_TYPE, FORMAT_ERRNO);
SEND_UNPACKET_ERROR(socket, ERROR_TYPE, UNPACKET_ERRNO, FORMAT_ERRNO);
return false;
}

Expand Down
5 changes: 4 additions & 1 deletion plugins/imcloud/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ logic_unit.o : $(USER_DIR)/logic/logic_unit.cc $(USER_DIR)/logic/logic_unit.h
star_infos.o : $(USER_DIR)/logic/star_infos.cc $(USER_DIR)/logic/star_infos.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/logic/star_infos.cc $(INCLUDE_PATHS)

packet_process_assist.o : $(USER_DIR)/net/packet_process_assist.cc $(USER_DIR)/net/packet_process_assist.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_process_assist.cc $(INCLUDE_PATHS)

packet_processing.o : $(USER_DIR)/net/packet_processing.cc $(USER_DIR)/net/packet_processing.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_processing.cc $(INCLUDE_PATHS)

Expand Down Expand Up @@ -118,7 +121,7 @@ json_value.o : $(USER_DIR)/json/json_value.cpp
json_writer.o : $(USER_DIR)/json/json_writer.cpp
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/json/json_writer.cpp $(INCLUDE_PATHS)
$(PLUGIN) : json_reader.o json_value.o json_writer.o im_init.o im_logic.o im_mysql.o im_process.o fcgimodule.o util.o star_infos.o logic_unit.o packet_processing.o \
data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o im_proto.o \
packet_process_assist.o data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o im_proto.o \
$(CUSTOM_THIRD_PATH)/dmg_fp/lib/dmg_fp.a $(LIB_DIR)/mylib/base/lib/mybase.a $(LIB_DIR)/mylib/third_party/lib/libhiredis.a
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LINK_PATHS) -lcurl -lpthread -lexpat -lrt -ldl -lmysqlclient -lfcgi++ \
$^ -o $@
Expand Down
2 changes: 1 addition & 1 deletion plugins/imcloud/im_logic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ bool Imlogic::OnImMessage(struct server *srv, const int socket,
return false;
if (!net::PacketProsess::UnpackStream(msg, len, &packet)) {
LOG_ERROR2("UnpackStream Error socket %d", socket);
send_error(socket, ERROR_TYPE, ERROR_TYPE, FORMAT_ERRNO);
SEND_UNPACKET_ERROR(socket, ERROR_TYPE, UNPACKET_ERRNO, FORMAT_ERRNO);
return false;
}
switch (packet->operate_code) {
Expand Down
5 changes: 4 additions & 1 deletion plugins/infomation/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ logic_unit.o : $(USER_DIR)/logic/logic_unit.cc $(USER_DIR)/logic/logic_unit.h
star_infos.o : $(USER_DIR)/logic/star_infos.cc $(USER_DIR)/logic/star_infos.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/logic/star_infos.cc $(INCLUDE_PATHS)

packet_process_assist.o : $(USER_DIR)/net/packet_process_assist.cc $(USER_DIR)/net/packet_process_assist.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_process_assist.cc $(INCLUDE_PATHS)

packet_processing.o : $(USER_DIR)/net/packet_processing.cc $(USER_DIR)/net/packet_processing.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_processing.cc $(INCLUDE_PATHS)

Expand Down Expand Up @@ -113,7 +116,7 @@ json_value.o : $(USER_DIR)/json/json_value.cpp
json_writer.o : $(USER_DIR)/json/json_writer.cpp
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/json/json_writer.cpp $(INCLUDE_PATHS)
$(PLUGIN) : infomation_db.o json_reader.o json_value.o json_writer.o infomation_init.o infomation_logic.o fcgimodule.o util.o star_infos.o logic_unit.o packet_processing.o \
data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o \
packet_process_assist.o data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o \
$(CUSTOM_THIRD_PATH)/dmg_fp/lib/dmg_fp.a $(LIB_DIR)/mylib/base/lib/mybase.a $(LIB_DIR)/mylib/third_party/lib/libhiredis.a
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LINK_PATHS) -lpthread -lexpat -lrt -ldl -lmysqlclient -lfcgi++ \
$^ -o $@
Expand Down
2 changes: 1 addition & 1 deletion plugins/infomation/infomation_logic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ bool Infomationlogic::OnInfomationMessage(struct server *srv, const int socket,
return false;
if (!net::PacketProsess::UnpackStream(msg, len, &packet)) {
LOG_ERROR2("UnpackStream Error socket %d", socket);
send_error(socket, ERROR_TYPE, ERROR_TYPE, FORMAT_ERRNO);
SEND_UNPACKET_ERROR(socket, ERROR_TYPE, UNPACKET_ERRNO, FORMAT_ERRNO);
return false;
}
switch (packet->operate_code) {
Expand Down
5 changes: 4 additions & 1 deletion plugins/market/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ logic_unit.o : $(USER_DIR)/logic/logic_unit.cc $(USER_DIR)/logic/logic_unit.h
star_infos.o : $(USER_DIR)/logic/star_infos.cc $(USER_DIR)/logic/star_infos.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/logic/star_infos.cc $(INCLUDE_PATHS)

packet_process_assist.o : $(USER_DIR)/net/packet_process_assist.cc $(USER_DIR)/net/packet_process_assist.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_process_assist.cc $(INCLUDE_PATHS)

packet_processing.o : $(USER_DIR)/net/packet_processing.cc $(USER_DIR)/net/packet_processing.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_processing.cc $(INCLUDE_PATHS)

Expand Down Expand Up @@ -113,7 +116,7 @@ json_value.o : $(USER_DIR)/json/json_value.cpp
json_writer.o : $(USER_DIR)/json/json_writer.cpp
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/json/json_writer.cpp $(INCLUDE_PATHS)
$(PLUGIN) : market_db.o json_reader.o json_value.o json_writer.o market_init.o market_logic.o fcgimodule.o util.o star_infos.o logic_unit.o packet_processing.o \
data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o \
packet_process_assist.o data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o \
$(CUSTOM_THIRD_PATH)/dmg_fp/lib/dmg_fp.a $(LIB_DIR)/mylib/base/lib/mybase.a $(LIB_DIR)/mylib/third_party/lib/libhiredis.a
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LINK_PATHS) -lpthread -lexpat -lrt -ldl -lmysqlclient -lfcgi++ \
$^ -o $@
Expand Down
2 changes: 1 addition & 1 deletion plugins/market/market_logic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ bool Marketlogic::OnInfomationMessage(struct server *srv, const int socket,
return false;
if (!net::PacketProsess::UnpackStream(msg, len, &packet)) {
LOG_ERROR2("UnpackStream Error socket %d", socket);
send_error(socket, ERROR_TYPE, ERROR_TYPE, FORMAT_ERRNO);
SEND_UNPACKET_ERROR(socket, ERROR_TYPE, UNPACKET_ERRNO, FORMAT_ERRNO);
return false;
}
switch (packet->operate_code) {
Expand Down
5 changes: 4 additions & 1 deletion plugins/netflashsale/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ logic_unit.o : $(USER_DIR)/logic/logic_unit.cc $(USER_DIR)/logic/logic_unit.h
star_infos.o : $(USER_DIR)/logic/star_infos.cc $(USER_DIR)/logic/star_infos.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/logic/star_infos.cc $(INCLUDE_PATHS)

packet_process_assist.o : $(USER_DIR)/net/packet_process_assist.cc $(USER_DIR)/net/packet_process_assist.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_process_assist.cc $(INCLUDE_PATHS)

packet_processing.o : $(USER_DIR)/net/packet_processing.cc $(USER_DIR)/net/packet_processing.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_processing.cc $(INCLUDE_PATHS)

Expand All @@ -126,7 +129,7 @@ time.o : $(USER_DIR)/logic/time.cc $(USER_DIR)/logic/time.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/logic/time.cc $(INCLUDE_PATHS)

$(PLUGIN) : netflash_init.o netflash_logic.o netflash_db.o share_memory.o flash_info.o netflash_kafka.o netflash_schduler_engine.o \
star_infos.o time.o logic_unit.o packet_processing.o data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o\
star_infos.o time.o logic_unit.o packet_process_assist.o packet_processing.o data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o\
$(CUSTOM_THIRD_PATH)/dmg_fp/lib/dmg_fp.a $(LIB_DIR)/mylib/base/lib/mybase.a $(LIB_DIR)/mylib/third_party/lib/libhiredis.a $(CUSTOM_THIRD_PATH)/librdkafka/librdkafka.a
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LINK_PATHS) -lpthread -lexpat -lrt -ldl -lmysqlclient \
$^ -o $@
Expand Down
1 change: 1 addition & 0 deletions plugins/netflashsale/netflash_logic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ bool Netflashlogic::OnNetflashMessage(struct server *srv, const int socket,
if (!net::PacketProsess::UnpackStream(msg, len, &packet))
{
LOG_ERROR2("UnpackStream Error socket %d", socket);
SEND_UNPACKET_ERROR(socket, ERROR_TYPE, UNPACKET_ERRNO, FORMAT_ERRNO);
return false;
}

Expand Down
5 changes: 4 additions & 1 deletion plugins/pay/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ logic_unit.o : $(USER_DIR)/logic/logic_unit.cc $(USER_DIR)/logic/logic_unit.h
star_infos.o : $(USER_DIR)/logic/star_infos.cc $(USER_DIR)/logic/star_infos.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/logic/star_infos.cc $(INCLUDE_PATHS)

packet_process_assist.o : $(USER_DIR)/net/packet_process_assist.cc $(USER_DIR)/net/packet_process_assist.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_process_assist.cc $(INCLUDE_PATHS)

packet_processing.o : $(USER_DIR)/net/packet_processing.cc $(USER_DIR)/net/packet_processing.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_processing.cc $(INCLUDE_PATHS)

Expand All @@ -131,7 +134,7 @@ storager_kafka.o : ./storager_kafka.cc ./storager_kafka.h


$(PLUGIN) : unionpay_order.o pay_init.o pay_logic.o pay_db.o pay_proto_buf.o schduler_engine.o wx_order.o http_client.o aplipay_clt.o logic_unit.o\
star_infos.o packet_processing.o data_engine.o data_engine.o data_mysql_engine.o storager_kafka.o \
star_infos.o packet_process_assist.o packet_processing.o data_engine.o data_engine.o data_mysql_engine.o storager_kafka.o \
data_redis_engine.o mysql_pool.o redis_pool.o \
$(CUSTOM_THIRD_PATH)/dmg_fp/lib/dmg_fp.a $(LIB_DIR)/mylib/base/lib/mybase.a $(LIB_DIR)/mylib/third_party/lib/libhiredis.a\
$(CUSTOM_THIRD_PATH)/lib/librdkafka.a
Expand Down
2 changes: 1 addition & 1 deletion plugins/pay/pay_logic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ bool Paylogic::OnPayMessage(struct server *srv, const int socket,
return false;

if (!net::PacketProsess::UnpackStream(msg, len, &packet)) {
send_error(socket, ERROR_TYPE, ERROR_TYPE, FORMAT_ERRNO);
SEND_UNPACKET_ERROR(socket, ERROR_TYPE, UNPACKET_ERRNO, FORMAT_ERRNO);
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion plugins/push/push_logic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ bool CPushlogic::OnPushMessage(struct server *srv, const int socket,
return false;
if (!net::PacketProsess::UnpackStream(msg, len, &packet)) {
LOG_ERROR2("UnpackStream Error socket %d", socket);
send_error(socket, ERROR_TYPE, ERROR_TYPE, FORMAT_ERRNO);
SEND_UNPACKET_ERROR(socket, ERROR_TYPE, UNPACKET_ERRNO, FORMAT_ERRNO);
return false;
}
switch (packet->operate_code) {
Expand Down
5 changes: 4 additions & 1 deletion plugins/quotations/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ logic_unit.o : $(USER_DIR)/logic/logic_unit.cc $(USER_DIR)/logic/logic_unit.h
star_infos.o : $(USER_DIR)/logic/star_infos.cc $(USER_DIR)/logic/star_infos.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/logic/star_infos.cc $(INCLUDE_PATHS)

packet_process_assist.o : $(USER_DIR)/net/packet_process_assist.cc $(USER_DIR)/net/packet_process_assist.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_process_assist.cc $(INCLUDE_PATHS)

packet_processing.o : $(USER_DIR)/net/packet_processing.cc $(USER_DIR)/net/packet_processing.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/net/packet_processing.cc $(INCLUDE_PATHS)

Expand All @@ -120,7 +123,7 @@ xml_parser.o : $(USER_DIR)/logic/xml_parser.cc $(USER_DIR)/logic/xml_parser.h


$(PLUGIN) : quotations_init.o quotations_logic.o schduler_engine.o quotations_proto_buf.o quotations_redis.o quotations_db.o\
star_infos.o logic_unit.o packet_processing.o data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o\
star_infos.o logic_unit.o packet_process_assist.o packet_processing.o data_engine.o data_mysql_engine.o data_redis_engine.o mysql_pool.o redis_pool.o\
$(CUSTOM_THIRD_PATH)/dmg_fp/lib/dmg_fp.a $(LIB_DIR)/mylib/base/lib/mybase.a $(LIB_DIR)/mylib/third_party/lib/libhiredis.a
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LINK_PATHS) -lpthread -lexpat -lrt -ldl -lmysqlclient \
$^ -o $@
Expand Down
2 changes: 1 addition & 1 deletion plugins/quotations/quotations_logic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ bool Quotationslogic::OnQuotationsMessage(struct server *srv, const int socket,

if (!net::PacketProsess::UnpackStream(msg, len, &packet)) {
LOG_ERROR2("UnpackStream Error socket %d", socket);
send_error(socket, ERROR_TYPE, ERROR_TYPE, FORMAT_ERRNO);
SEND_UNPACKET_ERROR(socket, ERROR_TYPE, UNPACKET_ERRNO, FORMAT_ERRNO);
return false;
}

Expand Down
Loading