diff --git a/src/accountMgr/c_program/cdrCollector/cdr.c b/src/accountMgr/c_program/cdrCollector/cdr.c index 830e14c..9f0ec34 100644 --- a/src/accountMgr/c_program/cdrCollector/cdr.c +++ b/src/accountMgr/c_program/cdrCollector/cdr.c @@ -1449,16 +1449,19 @@ void cdr_parse(cdr_sys *psys,int tagcode,ASN_BUF *asnbuf,int fieldIndex,char* fi { //opps need cc - if(psrc->sysTypeNo == 375) - sprintf(fieldstr,",'%s'",digits2str(tempbyte,len * 2)); - else if (psrc->sysTypeNo == 320 && !strcmp(pdef->fields[fieldIndex].tags[tagcode], "7.12")) - { - if (tempbyte[0] == 0x91 ||tempbyte[0] == 0x81 ||tempbyte[0] == 0xa1) { - sprintf(fieldstr, ",'%s'", digits2str(tempbyte + 1, (len - 1) * 2)); - } else { - // 阿斯克码值 - sprintf(fieldstr, ",'%s'", askm2str(tempbyte, len * 2)); - } + if (psrc->sysTypeNo == 375) { + sprintf(fieldstr, ",'%s'", digits2str(tempbyte, len * 2)); + } else if ((psrc->sysTypeNo == 320 && !strcmp(pdef->fields[fieldIndex].tags[tagcode], "7.12")) || + (psrc->sysTypeNo == 351 && + (!strcmp(pdef->fields[fieldIndex].tags[tagcode], "0.1") || + !strcmp(pdef->fields[fieldIndex].tags[tagcode], "0.2")))) { + + if (tempbyte[0] == 0x91 || tempbyte[0] == 0x81 || tempbyte[0] == 0xa1) { + sprintf(fieldstr, ",'%s'", digits2str(tempbyte + 1, (len - 1) * 2)); + } else { + // 阿斯克码值 + sprintf(fieldstr, ",'%s'", askm2str(tempbyte, len * 2)); + } } else sprintf(fieldstr,",'%s'",digits2str(tempbyte + 1,(len - 1) * 2)); diff --git a/src/performanceMgr/c_program/logCollector/logCollector.h b/src/performanceMgr/c_program/logCollector/logCollector.h index 1b616e2..b5c821d 100644 --- a/src/performanceMgr/c_program/logCollector/logCollector.h +++ b/src/performanceMgr/c_program/logCollector/logCollector.h @@ -20,7 +20,7 @@ #endif #define MaxLogSrcNum 16 //max number of command can be execute as same time -#define MaxAttrDefnNum 256 +#define MaxAttrDefnNum 512 #define MaxOidLen 20 //max number of object ID #define MaxSubOidLen 10 //max number of sub object ID #define MaxVarNum 50 //max number of var in one pdu