dodiff.out

mgcp协议源代码。支持多种编码：g711

/tmp/OSPToolkit-2.5.2/src vs /usr/local/wbreu/cvs/vocal/contrib/osptk-2.5.1/src\n
************************* diff'n *.c files ***********************
********** begin ospaltinfo.c
53,54d52
< const unsigned OSPVNumElemAltInfoTypes = sizeof(OSPVTypeStringTable)/sizeof(OSP_TYPE_ATTR_STRUCT);
< 
234a233
>             /* Need to add code here to check for type. Everything is transport now. */
237c236
<                 (const unsigned char *)OSPPAltInfoGetTypeName(ospvAltInfo));
---
>                 (const unsigned char *)"transport"/* OSPPAltInfoGetTypeStr(ospvAltInfo)*/);
251a251
> #endif
253,266d252
< /*-----------------------------------------------------------------------*
<  * OSPPAltInfoGetTypeName() - get type name from an altinfo
<  *-----------------------------------------------------------------------*/
< 
< const char *                        /* Returns a pointer to the name */
< OSPPAltInfoGetTypeName(
<     OSPTALTINFO     *ospvAltInfo
< )
< {
<     const char *ospvName = OSPC_OSNULL;
<     OSPE_TYPE_ATTR_VAL  ospvType = ospetypeupper;
<     unsigned int cnt = 0;
< 
<     ospvType = (OSPE_TYPE_ATTR_VAL)ospvAltInfo->ospmAltInfoType;
268,278d253
<     for (cnt=0; cnt < OSPVNumElemAltInfoTypes; cnt++)
<     {
<         if (OSPVTypeStringTable[cnt].ospmType == ospvType)
<         {
<         ospvName = OSPVTypeStringTable[cnt].ospmTypeStr;
<         break;
<         }
<     }
<     return(ospvName);
< }
< #endif
********** end ospaltinfo.c

********** begin ospasn1.c
25d24
< 
314c313
<                 case OSPC_TAG_TYPE_BMPSTRING:
---
> 								case OSPC_TAG_TYPE_BMPSTRING:
649,655c648,654
<                 if (eInfo != OSPC_OSNULL) 
<                 {
<                     sprintf(msg, "Tag mismatch, pt = %02x, e = %02x", 
<                     parseRule->Tag, eInfo->Tag);
<                 } else {
<                     sprintf(msg, "Tag mismatch, pt = %02x, eInfo=NULL", parseRule->Tag);
<                 }
---
> 				if (eInfo != OSPC_OSNULL) 
> 				{
>                 	sprintf(msg, "Tag mismatch, pt = %02x, e = %02x", 
>                     			parseRule->Tag, eInfo->Tag);
> 				} else {
> 					sprintf(msg, "Tag mismatch, pt = %02x, eInfo=NULL", parseRule->Tag);
> 				}
********** end ospasn1.c

********** begin ospasn1ids.c
********** end ospasn1ids.c

********** begin ospasn1object.c
********** end ospasn1object.c

********** begin ospasn1parse.c
25d24
< 
649,657c648,656
<     {"CertReq", OSPC_TAG_TYPE_SEQUENCE,
<                                 OSPEPTID_NOTDEFINED, 0x0, 1, 1, 0, 0 },
<     {"certReqInfo",        OSPC_TAG_TYPE_DERIVED,
<                                 OSPEPTID_CERTREQINFO, 0x1, 1, 1, 0, 0 },
<     {"signatureAlgorithm", OSPC_TAG_TYPE_DERIVED,
<                                 OSPEPTID_SIGNATUREALGORITHM, 0x2, 1, 1, 0, 0 },
<     {"signature",          OSPC_TAG_TYPE_BIT_STRING,
<                                 OSPEPTID_NOTDEFINED, 0x3, 1, 1, 0, 0 },
<     {OSPC_OSNULL}
---
> 	{"CertReq", OSPC_TAG_TYPE_SEQUENCE,
> 						       OSPEPTID_NOTDEFINED, 0x0, 1, 1, 0, 0 },
> 	{"certReqInfo",        OSPC_TAG_TYPE_DERIVED,
> 						       OSPEPTID_CERTREQINFO, 0x1, 1, 1, 0, 0 },
> 	{"signatureAlgorithm", OSPC_TAG_TYPE_DERIVED,
> 							   OSPEPTID_SIGNATUREALGORITHM, 0x2, 1, 1, 0, 0 },
> 	{"signature",          OSPC_TAG_TYPE_BIT_STRING,
> 							   OSPEPTID_NOTDEFINED, 0x3, 1, 1, 0, 0 },
> 	{OSPC_OSNULL}
662,672c661,671
<     {"CertReqInfo",        OSPC_TAG_TYPE_SEQUENCE,
<                                 OSPEPTID_NOTDEFINED, 0x0, 1, 1, 0, 0 },
<     {"version",            OSPC_TAG_TYPE_INTEGER,
<                                 OSPEPTID_NOTDEFINED, 0x1, 1, 1, 0, 0 },
<     {"Subject",            OSPC_TAG_TYPE_DERIVED,
<                                 OSPEPTID_RDNSEQUENCE, 0x2, 1, 1, 0, 0 },
<     {"subjectPubKeyInfo",  OSPC_TAG_TYPE_DERIVED,
<                                 OSPEPTID_SUBJPUBKEYINFO, 0x3, 1, 1, 0, 0 },
<     {"attributes",         OSPM_TAG_TYPE_EXPLICIT_TAG(0),
<                                 OSPEPTID_NOTDEFINED, 0x4, 0, 1, 0, 0 },
<     {OSPC_OSNULL}
---
> 	{"CertReqInfo",        OSPC_TAG_TYPE_SEQUENCE,
> 							   OSPEPTID_NOTDEFINED, 0x0, 1, 1, 0, 0 },
> 	{"version",            OSPC_TAG_TYPE_INTEGER,
> 							   OSPEPTID_NOTDEFINED, 0x1, 1, 1, 0, 0 },
> 	{"Subject",            OSPC_TAG_TYPE_DERIVED,
> 							   OSPEPTID_RDNSEQUENCE, 0x2, 1, 1, 0, 0 },
> 	{"subjectPubKeyInfo",  OSPC_TAG_TYPE_DERIVED,
> 							   OSPEPTID_SUBJPUBKEYINFO, 0x3, 1, 1, 0, 0 },
> 	{"attributes",         OSPM_TAG_TYPE_EXPLICIT_TAG(0),
> 							   OSPEPTID_NOTDEFINED, 0x4, 0, 1, 0, 0 },
> 	{OSPC_OSNULL}
1032c1031
<                             0xff };
---
> 							0xff };
1041,1042c1040,1041
<                             OSPC_ASN1_DATAREFID_CERTREQINFO,
<                             0xff };
---
> 							OSPC_ASN1_DATAREFID_CERTREQINFO,
> 							0xff };
1049,1051c1048,1050
<                             OSPC_ASN1_DATAREFID_CERTREQINFO,
<                             OSPC_ASN1_DATAREFID_CERTREQINFO_VERSION,
<                             0xff };
---
> 							OSPC_ASN1_DATAREFID_CERTREQINFO,
> 							OSPC_ASN1_DATAREFID_CERTREQINFO_VERSION,
> 							0xff };
1058,1060c1057,1059
<                             OSPC_ASN1_DATAREFID_CERTREQINFO,
<                             OSPC_ASN1_DATAREFID_CERTREQINFO_SUBJECT,
<                             0xff };
---
> 							OSPC_ASN1_DATAREFID_CERTREQINFO,
> 							OSPC_ASN1_DATAREFID_CERTREQINFO_SUBJECT,
> 							0xff };
1067,1069c1066,1068
<                             OSPC_ASN1_DATAREFID_CERTREQINFO,
<                             OSPC_ASN1_DATAREFID_CERTREQINFO_SUBJPUBKEYINFO,
<                             0xff };
---
> 							OSPC_ASN1_DATAREFID_CERTREQINFO,
> 							OSPC_ASN1_DATAREFID_CERTREQINFO_SUBJPUBKEYINFO,
> 							0xff };
1076,1078c1075,1077
<                             OSPC_ASN1_DATAREFID_CERTREQINFO,
<                             OSPC_ASN1_DATAREFID_CERTREQINFO_ATTRIBUTES,
<                             0xff };
---
> 							OSPC_ASN1_DATAREFID_CERTREQINFO,
> 							OSPC_ASN1_DATAREFID_CERTREQINFO_ATTRIBUTES,
> 							0xff };
1085,1086c1084,1085
<                             OSPC_ASN1_DATAREFID_CERTREQ_SIGNATURE_ALGORITHM,
<                             0xff };
---
> 							OSPC_ASN1_DATAREFID_CERTREQ_SIGNATURE_ALGORITHM,
> 							0xff };
1091,1092c1090,1091
<                             OSPC_ASN1_DATAREFID_CERTREQ_SIGNATURE,
<                             0xff };
---
> 							OSPC_ASN1_DATAREFID_CERTREQ_SIGNATURE,
> 							0xff };
1277,1284c1276,1283
<         if ( *ospvParseRule != OSPC_OSNULL )
<         {
<             if ((*ospvParseRule)->Name == OSPC_OSNULL)
<             {
<                 *ospvParseRule = OSPC_OSNULL;
<                 errorcode = OSPC_ERR_ASN1_PARSE_COMPLETE;
<             }
<         }
---
> 		if ( *ospvParseRule != OSPC_OSNULL )
> 		{
> 	        if ((*ospvParseRule)->Name == OSPC_OSNULL)
> 	        {
> 	            *ospvParseRule = OSPC_OSNULL;
> 	            errorcode = OSPC_ERR_ASN1_PARSE_COMPLETE;
> 	        }
> 		}
********** end ospasn1parse.c

********** begin ospasn1primitives.c
82c82
<             case OSPC_TAG_TYPE_BMPSTRING:
---
> 						case OSPC_TAG_TYPE_BMPSTRING:
294a295,305
> 
> void
> OSPPASN1IntegerDelete(
>     void **ospvContentValue)
> {
>     if ((ospvContentValue != OSPC_OSNULL) &&
>         (*ospvContentValue != OSPC_OSNULL)
>         return;
> }
> 
> 
********** end ospasn1primitives.c

********** begin ospaudit.c
328,332d327
< 
<                 if(compid != OSPC_OSNULL)
<                 {
<                     OSPM_FREE(compid);
<                 }
357c352
<             OSPM_MALLOC(compid->ospmComponentId, unsigned char, ospvComponentIdLen + 1);
---
>             OSPM_MALLOC(compid->ospmComponentId, unsigned char, ospvComponentIdLen);
599,620d593
<     /* add message id string to buffer.
<        use the random generator since we have no TransactionID
<     */
<     numbyteswritten = OSPPUtilGetRandom(random, 0);
<     if(numbyteswritten > 0)
<     {
<         numbyteswritten = OSPPBfrWriteBlock(&(ospvAudit->ospmAuditStorage),
<                                         random, 
<                                         numbyteswritten);
<         /* increment used space */
<         OSPPAuditIncrementUsedSpace(ospvAudit, numbyteswritten);
<         numbyteswritten = 0;
<         OSPM_MEMSET(random, 0, OSPC_MAX_RANDOM);
<     }
< 
<     /* add "random" string to buffer */
<     numbyteswritten = OSPPBfrWriteBlock(&(ospvAudit->ospmAuditStorage),
<                                         OSPC_AUDIT_MSG_RANDOM, 
<                                         OSPC_AUDIT_MSG_RANDOM_LEN);
<     /* increment used space */
<     OSPPAuditIncrementUsedSpace(ospvAudit, numbyteswritten);
<     numbyteswritten = 0;
1065,1070c1038,1043
<                 while(!OSPPListEmpty((OSPTLIST*)&resultrsp)) {
<                     usagecnf = (OSPTUSAGECNF *)OSPPListRemove((OSPTLIST*)&resultrsp);
<                     if(usagecnf != OSPC_OSNULL) {
<                         OSPPUsageCnfDelete(&usagecnf);
<                     }
<                 }
---
> 								while(!OSPPListEmpty((OSPTLIST*)&resultrsp)) {
> 									usagecnf = (OSPTUSAGECNF *)OSPPListRemove((OSPTLIST*)&resultrsp);
> 									if(usagecnf != OSPC_OSNULL) {
> 										OSPPUsageCnfDelete(&usagecnf);
> 									}
> 								}
1072c1045
<                 OSPPListDelete((OSPTLIST*)&resultrsp);
---
> 								OSPPListDelete((OSPTLIST*)&resultrsp);
********** end ospaudit.c

********** begin ospauthcnf.c
********** end ospauthcnf.c

********** begin ospauthind.c
430,472d429
< /**/
< /*-----------------------------------------------------------------------*
<  * OSPPAuthIndSetDest() - sets the destination for an authorisation
<  *-----------------------------------------------------------------------*/
< void
< OSPPAuthIndSetDest(
<     OSPTAUTHIND   *ospvAuthInd,
<     OSPTDEST      *ospvDest
< )
< {
<     if(ospvAuthInd != OSPC_OSNULL)
<     {
<         if(ospvDest != OSPC_OSNULL)
<         {
<             if(OSPPAuthIndHasDest(ospvAuthInd) == OSPC_TRUE)
<             {
<                 OSPPDestDelete(&(ospvAuthInd->ospmAuthIndDest));
<             }
<             ospvAuthInd->ospmAuthIndDest = ospvDest;
<         }
<     }
< }
< 
< /**/
< /*-----------------------------------------------------------------------*
<  * OSPPAuthIndHasDest() - does an authorisation indication have a 
<  * Destination?
<  *-----------------------------------------------------------------------*/
< unsigned
< OSPPAuthIndHasDest(
<     OSPTAUTHIND   *ospvAuthInd
< )
< {
<     if(ospvAuthInd->ospmAuthIndDest != OSPC_OSNULL)
<     {
<         return OSPC_TRUE;
<     }
<     else
<     {
<         return OSPC_FALSE;
<     }
< }
< 
573,574d529
<         OSPPDestDelete(&((*ospvAuthInd)->ospmAuthIndDest));
< 
603a559
> 
********** end ospauthind.c

********** begin ospauthreq.c
533,544d532
< /**/
< /*-----------------------------------------------------------------------*
<  * OSPPAuthReqHasComponentId() - is the component id set ?
<  *-----------------------------------------------------------------------*/
< unsigned                    /* returns non-zero if component id is set */
< OSPPAuthReqHasComponentId(
<     OSPTAUTHREQ *ospvAuthReq
< )
< {
<   return (ospvAuthReq->ospmAuthReqComponentId != OSPC_OSNULL);
< }
< 
555c543
<     OSPTAUTHREQ *ospvAuthReq = OSPC_OSNULL;
---
>     OSPTAUTHREQ *ospvAuthReq;
580d567
< 
612,622d598
<         if(OSPPAuthReqHasComponentId(*ospvAuthReq))
<         {
<             OSPM_FREE((*ospvAuthReq)->ospmAuthReqComponentId);
<         }
< 
< 
<         if(OSPPAuthReqHasMessageId(*ospvAuthReq))
<         {
<             OSPM_FREE((*ospvAuthReq)->ospmAuthReqMessageId);
<         }
< 
664c640
<     *ospvElem = OSPPXMLElemNew(OSPPMsgGetElemName(ospeElemMessage), "");
---
>     *ospvElem = OSPPXMLElemNew("Message", "");
673,674c649
<             (OSPPAuthReqHasMessageId(ospvAuthReq))?(const unsigned char *)(ospvAuthReq->ospmAuthReqMessageId): (const unsigned char *)"NULL");
< 
---
>             (const unsigned char *)"1");
718c693
<                 (OSPPAuthReqHasComponentId(ospvAuthReq))?(const unsigned char *)(ospvAuthReq->ospmAuthReqComponentId): (const unsigned char *)"NULL");
---
>                 (const unsigned char *)"1");
984,993d958
< /*-----------------------------------------------------------------------*
<  * OSPPAuthReqHasMessageId() - is the message id set ?
<  *-----------------------------------------------------------------------*/
< unsigned                   /* returns non-zero if message id is set */
< OSPPAuthReqHasMessageId(
<     OSPTAUTHREQ *ospvAuthReq
< )
< {
<   return (ospvAuthReq->ospmAuthReqMessageId != OSPC_OSNULL);
< }
********** end ospauthreq.c

********** begin ospauthrsp.c
299,310d298
< /**/
< /*-----------------------------------------------------------------------*
<  * OSPPAuthRspHasComponentId() - is the component id set ?
<  *-----------------------------------------------------------------------*/
< unsigned                    /* returns non-zero if component id is set */
< OSPPAuthRspHasComponentId(