fix: ussdgw从一次性套餐修改为进入下一个状态选择一次性或者循环套餐

Makefile

@@ -1,4 +1,5 @@
 src_dir=`pwd`
+bin_dir=$(src_dir)/bin
 
 .PHONY: all clean
 
@@ -21,15 +22,19 @@ mss_clean:
 	$(MAKE) -C mss clean
 
 pncc: plat_all
+	if [ ! -d $(bin_dir) ]; then mkdir $(bin_dir); fi
 	$(MAKE) -C mss pncc
 
 norfolk: plat_all
+	if [ ! -d $(bin_dir) ]; then mkdir $(bin_dir); fi
 	$(MAKE) -C mss norfolk
 
 cook: plat_all
+	if [ ! -d $(bin_dir) ]; then mkdir $(bin_dir); fi
 	$(MAKE) -C mss cook
 
 zed: plat_all
+	if [ ! -d $(bin_dir) ]; then mkdir $(bin_dir); fi
 	$(MAKE) -C mss zed
 
 plat_all:

mss/pps/src/main/dailyreport.c

@@ -640,7 +640,7 @@ int GetDailyReportByIndex(u_char oidLen,DWORD *oid,
 
 	PutLogFunID("GetDailyReportByIndex");
     asnbuf = &asnbuf1;
-    AsnEncode(pdata,512,asnbuf);
+    AsnEncode(pdata,1024,asnbuf);//512
 
 	index = oid[14];
 	saveIndex = index %7;
@@ -905,10 +905,22 @@ int GetDailyReportByIndex(u_char oidLen,DWORD *oid,
 	int offset=86, tagPerCode=8, codeLen=0;
 	for (i=0; i<USSDCODE_MAX_CODE_NUM; i++)
 	{
+		if (i==0)
+		{
+			strcpy(shmp->ussdcode_report[i].code, USSDCODE_QUERY_CODE_STR);
+		}
+		else if (i==1)
+		{
+			strcpy(shmp->ussdcode_report[i].code, USSDCODE_TOPUP_CODE_STR);
+		}
+		else if (i==2)
+		{
+			strcpy(shmp->ussdcode_report[i].code, USSDCODE_HOTLINE_CODE_STR);
+		}
 		codeLen = strlen(shmp->ussdcode_report[i].code);
 		if (codeLen <= 0)
 		{
-			//continue;
+			strcpy(shmp->ussdcode_report[i].code, "---");//continue;
 		}
 		
 		tag = offset + tagPerCode*i;
@@ -1223,7 +1235,7 @@ int	pps_update_ussd_code_state(char *code, int type, int result, int dur)
 		shmp->req_count++;
 		break;
 	case USSDCODE_STAT_DUR:
-		shmp->req_duration += (dur / CYCLE_STATE_INTERVAL);
+		shmp->req_duration += (dur / CYCLE_STATE_INTERVAL) +1;
 		break;
 	case USSDCODE_STAT_ERR_TIMEOUT:
 		if (dur > 0)

mss/pps/src/main/ppsussd.c

@@ -4691,7 +4691,7 @@ int ppsMapState(u_short portid)
                 if (match_channel_info(ussd_sc, shmp->process_info.ppsService.chnl_info.scUrl) > 0)
                 {
 #ifdef _ZED_NO_CALLER_NUM_AND_EXPIRY_DATE_ // ussd_code daily report
-					pps_update_ussd_code_state(ussd_sc, USSDCODE_TYPE_HOTLINE, USSDCODE_STAT_REQ, 0);
+					pps_update_ussd_code_state(ussd_sc, USSDCODE_TYPE_CHANNEL, USSDCODE_STAT_REQ, 0);
 #endif
                     shmp->process_info.sub_state = S_MAP_THIRD_PARTY_CHANNEL;
                     shmp->process_info.sub_state_2 = 1;
@@ -6215,6 +6215,17 @@ int pps_third_party_plan_process(u_short portid)
                             shmp->process_info.serviceInput = 0;
                             shmp->process_info.sub_state_2 = 28;//Recharge Airtime
 						break;
+						case 8:// KaBoosta: redirect to 118
+							if (match_channel_info("118", shmp->process_info.ppsService.chnl_info.scUrl) > 0)
+							{
+#ifdef _ZED_NO_CALLER_NUM_AND_EXPIRY_DATE_ // ussd_code daily report
+								pps_update_ussd_code_state("118", USSDCODE_TYPE_HOTLINE, USSDCODE_STAT_REQ, 0);
+#endif
+								shmp->process_info.sub_state = S_MAP_THIRD_PARTY_CHANNEL;
+								shmp->process_info.sub_state_2 = 1;
+								break;
+							}
+						break;
 						case 0:
                             SendUSSDRequest(portid, yx_ussd_menu[YX_USSD_MENU_DIBAAMA]);// YX_USSD_MENU_PRESS_AMA
                             shmp->process_info.serviceInput = 0;
@@ -6520,6 +6531,13 @@ int pps_third_party_plan_process(u_short portid)
                             shmp->process_info.serviceInput = 0;
                             shmp->process_info.sub_state_2 = 27;//amaFive
 						break;
+						case 4:// 4. K1 - Weekend 150MB   offerId: 267067
+							SendUSSDRequest(portid, yx_ussd_menu[YX_USSD_MENU_SELECT_MONEY]);
+							shmp->process_info.rest_if.bundle_plan_id = yx_offerIds[YX_OFFER_TYPE_AMA_1][6];
+							shmp->process_info.serviceInput = 0;
+							shmp->process_info.sub_state_2 = 31;//select money
+							shmp->process_info.funnel = 0;
+						break;
 						default:
 							shmp->process_info.serviceInput = 0;
                             shmp->process_info.sub_state_2 = 1;
@@ -6723,17 +6741,18 @@ int pps_third_party_plan_process(u_short portid)
 					switch(key_input)
 					{
 						case 1:// K20 Unlimited-24hrs
-                            /*SendUSSDRequest(portid, yx_ussd_menu[YX_USSD_MENU_UNLIMITED_ONCE_RECUR]);
-                            shmp->process_info.rest_if.bundle_plan_id = 0;// yx_offerIds[YX_OFFER_TYPE_BUNDLE][0];
-                            shmp->process_info.serviceInput = 0;
-                            shmp->process_info.sub_state_2 = 21;//once, recur or cancel
-                            shmp->process_info.funnel = 0;*/
-
-							SendUSSDRequest(portid, yx_ussd_menu[YX_USSD_MENU_SELECT_MONEY]);
-							shmp->process_info.rest_if.bundle_plan_id = yx_offerIds[YX_OFFER_TYPE_BUNDLE][0];
+							// 进入下一个状态选择一次性或者循环套餐
+							SendUSSDRequest(portid, yx_ussd_menu[YX_USSD_MENU_UNLIMITED_ONCE_RECUR]);
+							shmp->process_info.rest_if.bundle_plan_id = 0; // yx_offerIds[YX_OFFER_TYPE_BUNDLE][0];
 							shmp->process_info.serviceInput = 0;
-							shmp->process_info.sub_state_2 = 31;//select money
+							shmp->process_info.sub_state_2 = 21; // once, recur or cancel
 							shmp->process_info.funnel = 0;
+
+							// SendUSSDRequest(portid, yx_ussd_menu[YX_USSD_MENU_SELECT_MONEY]);
+							// shmp->process_info.rest_if.bundle_plan_id = yx_offerIds[YX_OFFER_TYPE_BUNDLE][0];
+							// shmp->process_info.serviceInput = 0;
+							// shmp->process_info.sub_state_2 = 31;//select money
+							// shmp->process_info.funnel = 0;
 						break;
 						case 2:// K20 Unlimited-3 Days
                             SendUSSDRequest(portid, yx_ussd_menu[YX_USSD_MENU_UNLIMITED_ONCE_RECUR]);
@@ -7052,7 +7071,7 @@ int pps_third_party_plan_process(u_short portid)
                         case 4:
                         case 5:
                         case 6:
-                        case 7:
+                        //case 7:
                             SendUSSDRequest(portid, yx_ussd_menu[YX_USSD_MENU_SELECT_MONEY]);
                             shmp->process_info.rest_if.bundle_plan_id = yx_offerIds[YX_OFFER_TYPE_AMA_1][key_input-1];
                             shmp->process_info.serviceInput = 0;

plat/diameter/makefile

@@ -19,11 +19,12 @@ CFLAGS=-Wall -g -DDEBUG -DX86_64 -lm -lrt -ldl -lsctp -lgcrypt -lgnutls -lpthrea
 CC=gcc
 
 $(TGT):$(OBJS)
-#	$(CC) -o $(TGT) $(CFLAGS) $(MAIN) $(SRCS) $(INCDIR) $(LIBS)
-#	chmod a+x $(TGT)
-	ar r ./lib/libdiameter.a $(OBJS)
+	if [ ! -d $(TOPDIR)/lib ]; then mkdir $(TOPDIR)/lib; fi
+	$(AR) -rcs $(TOPDIR)/lib/libdiameter.a $(OBJS)
 
 $(OBJS):%.o:%.c
 	$(CC) $(CFLAGS) -c -o $@ $< $(INCDIR)
+	
 clean:
 	rm -rf $(OBJS) $(TGT)
+	rm -rf $(TOPDIR)/lib/libdiameter.a