diff --git a/src/AV_interface.h b/src/AV_interface.h index 192341d..6a70e1e 100644 --- a/src/AV_interface.h +++ b/src/AV_interface.h @@ -1,7 +1,7 @@ #ifndef _AV_INTERFACE_H #define _AV_INTERFACE_H -#define K_PROJECT 0 //是否是K项目,主要是建议的接口不一致 +#define K_PROJECT 1 //是否是K项目,主要是建议的接口不一致 #define PROTO_VERSION 3 #define PROTO_MAGICNUM 0x5641 diff --git a/src/Makefile b/src/Makefile index 3ce161d..875659d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -7,9 +7,19 @@ PAPP_PATH=/home/mesasoft/frag_rssb/ #CFLAGS = -g3 -Wall -fPIC -O INCLUDES = -I./inc/ INCLUDES += -I/usr/include/MESA/ -INCLUDES += -I./support/hiredis-vip-master/ +INCLUDES += -I./support/hiredisv4/ CFLAGS = -g3 -Wall -fPIC -D__STDC_FORMAT_MACROS CFLAGS += $(INCLUDES) + +ifeq ($(MODE), PIC) +CFLAGS += -DPIC_FUNC=1 +TARGET = pic_rssb_maskey +else ifeq ($(MODE), VOIP) +CFLAGS += -DPIC_FUNC=1 +TARGET = voip_rssb_maskey +else +TARGET = av_rssb_maskey +endif #LDDICTATOR = -Wl,-wrap,malloc -Wl,-wrap,calloc -Wl,-wrap,free -Wl,-wrap,realloc LDDICTATOR = CC = g++ @@ -34,9 +44,6 @@ OBJECTS = $(SOURCES:.c=.o) OBJECTSCPP = $(SOURCESCPP:.cpp=.o) #DEPS = $(SOURCES:.c=.d) - -TARGET = rssb_maskey - .PHONY:clean all all:$(TARGET) diff --git a/src/main.c b/src/main.c index 8748e95..589a8fd 100644 --- a/src/main.c +++ b/src/main.c @@ -1076,10 +1076,15 @@ int main(int argc, char **argv) wired_cfg_init(main_conf_handle); rssb_conf_handle=wired_cfg_create("VOIP_RSSB_CONF", "./conf/frag_reassembly.conf"); wired_cfg_init(rssb_conf_handle); -#else - main_conf_handle=wired_cfg_create("RSSB_MAIN_CONF", "./conf/main.conf"); +#elif PIC_FUNC + main_conf_handle=wired_cfg_create("PIC_RSSB_MAIN_CONF", "./conf/main.conf"); wired_cfg_init(main_conf_handle); - rssb_conf_handle=wired_cfg_create("RSSB_CONF", "./conf/frag_reassembly.conf"); + rssb_conf_handle=wired_cfg_create("PIC_RSSB_REASSEMBLY_CONF", "./conf/frag_reassembly.conf"); + wired_cfg_init(rssb_conf_handle); +#else + main_conf_handle=wired_cfg_create("AV_RSSB_MAIN_CONF", "./conf/main.conf"); + wired_cfg_init(main_conf_handle); + rssb_conf_handle=wired_cfg_create("AV_RSSB_REASSEMBLY_CONF", "./conf/frag_reassembly.conf"); wired_cfg_init(rssb_conf_handle); #endif diff --git a/src/main.h b/src/main.h index 4e03cae..a6e7ce6 100644 --- a/src/main.h +++ b/src/main.h @@ -4,10 +4,6 @@ #include #include -#define APP_FUNC 0 //手机APP -#define VOIP_FUNC 1 //VOIP 主要是配置文件不一致 -#define PIC_FUNC 0 //PIC 主要是配置文件不一致 - #include "MESA_list_queue.h" #include "MESA_htable.h" #include "MESA_trace.h"