dodiff.out

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

<                     &(*ospvHttp), ospvComm->HttpTimeout);
<                 if ((*ospvHttp == (OSPTHTTP *)OSPC_OSNULL)||(errorcode != OSPC_ERR_NO_ERROR))
---
>                 *ospvHttp = osppHttpMinTransCheck(&(ospvComm->HttpConnList),
>                     *ospvHttp);
>                 if (*ospvHttp == (OSPTHTTP *)OSPC_OSNULL)
820,827c791,792
<                     if(errorcode == OSPC_ERR_HTTP_BAD_QUEUE)
<                     {
<                         OSPM_DBGERRORLOG(errorcode, "http msg queue corrupted");
<                     }
<                     else
<                     {
<                         OSPM_DBGERRORLOG(errorcode, "search for connection timedout");
<                     }
---
>                     errorcode = OSPC_ERR_HTTP_BAD_QUEUE;
>                     OSPM_DBGERRORLOG(errorcode, "http msg queue corrupted");
1060c1025,1026
<         begptr = OSPM_STRSTR((const char *)ospvInBuffer, "content-length: ");
---
> 		begptr = OSPM_STRSTR((const char *)ospvInBuffer, "content-length: ");
> 
1064c1030
<             if ((OSPM_SSCANF(begptr + 16, "%u", ospvLength)) != 1)
---
> 			if ((OSPM_SSCANF(begptr + 16, "%u", ospvLength)) != 1)
1071c1037
<                 OSPM_MALLOC(*ospvOutBuffer, unsigned char, *ospvLength + 1);
---
>                 OSPM_MALLOC(*ospvOutBuffer, unsigned char, *ospvLength);
1078c1044
<                     OSPM_MEMSET(*ospvOutBuffer, 0, *ospvLength + 1);
---
>                     OSPM_MEMSET(*ospvOutBuffer, 0, *ospvLength);
1093c1059,1060
<         begptr = OSPM_STRSTR((const char*)ospvInBuffer, "content-type: ");
---
> 		begptr = OSPM_STRSTR((const char*)ospvInBuffer, "content-type: ");
> 
1096c1063
<             endptr = OSPM_STRSTR(begptr, "\r\n");
---
> 			endptr = OSPM_STRSTR(begptr, "\r\n");
1125,1129c1092,1095
<         /*
<          * The Connection type is optional in the header. As a result,
<          * we do not generate an error if it does not exist. When it 
<          * does not exist, assume Connection: Keep-alive.
<          */
---
> 		case OSPC_HTTP_CONNECTION_TYPE:
> 		/*
> 		 * Parse Connection:
> 		 */
1131,1136c1097
<         case OSPC_HTTP_CONNECTION_TYPE:
<         /*
<          * Parse Connection:
<          */
< 
<         begptr = OSPM_STRSTR((const char *)ospvInBuffer, "connection: ");
---
> 		begptr = OSPM_STRSTR((const char *)ospvInBuffer, "connection: ");
1160a1122,1127
> 
>         /*
> 		 * The Connection type is optional in the header. As a result,
> 		 * we do not generate an error if it does not exist. When it 
> 		 * does not exist, assume Connection: Keep-alive.
> 		 */
********** end osphttp.c

********** begin ospinit.c
********** end ospinit.c

********** begin osplist.c
********** end osplist.c

********** begin ospmime.c
********** end ospmime.c

********** begin ospmsgattr.c
********** end ospmsgattr.c

********** begin ospmsgdesc.c
********** end ospmsgdesc.c

********** begin ospmsgelem.c
********** end ospmsgelem.c

********** begin ospmsginfo.c
********** end ospmsginfo.c

********** begin ospmsgque.c
********** end ospmsgque.c

********** begin ospmsgutil.c
355c355
<         if (cptr == ((char *)OSPPXMLElemGetValue(ospvElem)))
---
>         if (cptr == OSPPXMLElemGetValue(ospvElem))
********** end ospmsgutil.c

********** begin ospnossl.c
********** end ospnossl.c

********** begin ospopenssl.c
14a15
> * $Date: 2000/12/05 00:46:42 $
15a17
> * $Id: dodiff.out,v 1.1 2000/12/05 00:46:42 wbreu Exp $
16a19
> * $RCSfile: dodiff.out,v $
17a21
> * $Revision: 1.1 $
18a23
> * $Source: /cvsroot/vocal/contrib/OSPToolkit-2.5.2/src/dodiff.out,v $
87,91d91
< /* The following macro definition is to fix an anomaly between
<    openssl and OSP. The anomaly only occurs on Windows */
< #ifdef _WIN32
<         bio_stdout=BIO_new_fp((FILE *)SSLGetSSLstdout(),BIO_NOCLOSE);
< #else
93d92
< #endif
438a438
>     STACK_OF(X509)  *stackx509  = OSPC_OSNULL;
453d452
<         {
467d465
<                 {
479d476
<                 }
527d523
<         }
********** end ospopenssl.c

********** begin ospostime.c
********** end ospostime.c

********** begin osppkcs1.c
********** end osppkcs1.c

********** begin osppkcs7.c
********** end osppkcs7.c

********** begin osppkcs8.c
********** end osppkcs8.c

********** begin ospprovider.c
********** end ospprovider.c

********** begin ospproviderapi.c
********** end ospproviderapi.c

********** begin ospreauthreq.c
388,421d387
< /**/
< /*-----------------------------------------------------------------------*
<  * OSPPReauthReqHasComponentId() - is the component id set ?
<  *-----------------------------------------------------------------------*/
< unsigned                    /* returns non-zero if component id is set */
< OSPPReauthReqHasComponentId(
<     OSPTREAUTHREQ *ospvReauthReq
< )
< {
<   return (ospvReauthReq->ospmReauthReqComponentId != OSPC_OSNULL);
< }
< 
< /**/
< /*-----------------------------------------------------------------------*
<  * OSPPReauthReqGetComponentId() - returns a new copy of the component id.
<  *-----------------------------------------------------------------------*/
< unsigned char  *
< OSPPReauthReqGetComponentId(
<     OSPTREAUTHREQ *ospvReauthReq
< )
< {
<     unsigned char   *componentstring   = OSPC_OSNULL;
<     int             len                = 0;
< 
<     if (OSPPReauthReqHasComponentId(ospvReauthReq))
<     {
<         len = OSPM_STRLEN((const char *)ospvReauthReq->ospmReauthReqComponentId);
<         OSPM_MALLOC(componentstring, unsigned char, len + 1);
<         OSPM_MEMSET(componentstring, 0, len + 1);
<         OSPM_MEMCPY(componentstring, ospvReauthReq->ospmReauthReqComponentId, len);
<     }
< 
<     return componentstring;
< }
679,688d644
<         if(OSPPReauthReqHasMessageId(*ospvReauthReq))
<         {
<             OSPM_FREE((*ospvReauthReq)->ospmReauthReqMessageId);
<         }
< 
<         if(OSPPReauthReqHasComponentId(*ospvReauthReq))
<         {
<             OSPM_FREE((*ospvReauthReq)->ospmReauthReqComponentId);
<         }
< 
723,724d678
<         ospvReauthReq->ospmReauthReqComponentId = OSPC_OSNULL;
<         ospvReauthReq->ospmReauthReqMessageId = OSPC_OSNULL;
768c722
<     *ospvElem = OSPPXMLElemNew(OSPPMsgGetElemName(ospeElemMessage), "");
---
>         *ospvElem = OSPPXMLElemNew("Message", "");
777,778c731
<                 (OSPPReauthReqHasMessageId(ospvReauthReq))?(const unsigned char *)(ospvReauthReq->ospmReauthReqMessageId): (const unsigned char *)"NULL");
< 
---
>                 (const unsigned char *)"1");
824,825c777
<             (OSPPReauthReqHasComponentId(ospvReauthReq))?(const unsigned char *)(ospvReauthReq->ospmReauthReqComponentId): (const unsigned char *)"NULL");
< 
---
>             (const unsigned char *) "1");
1224,1235d1175
< 
< /*-----------------------------------------------------------------------*
<  * OSPPReauthReqHasMessageId() - is the message id set ?
<  *-----------------------------------------------------------------------*/
< unsigned                   /* returns non-zero if message id is set */
< OSPPReauthReqHasMessageId(
<     OSPTREAUTHREQ *ospvReauthReq
< )
< {
<   return (ospvReauthReq->ospmReauthReqMessageId != OSPC_OSNULL);
< }
< 
********** end ospreauthreq.c

********** begin ospreauthrsp.c
154,166d153
< 
< /**/
< /*-----------------------------------------------------------------------*
<  * OSPPReauthRspHasComponentId() - is the component id set ?
<  *-----------------------------------------------------------------------*/
< unsigned                    /* returns non-zero if component id is set */
< OSPPReauthRspHasComponentId(
<     OSPTREAUTHRSP *ospvReauthRsp
< )
< {
<   return (ospvReauthRsp->ospmReauthRspComponentId != OSPC_OSNULL);
< }
< 
204,205d190
<         ospvReauthRsp->ospmReauthRspComponentId = OSPC_OSNULL;
<         ospvReauthRsp->ospmReauthRspMessageId = OSPC_OSNULL;
227,229d211
<     OSPTXMLELEM     *ospvParent	= OSPC_OSNULL;
<     unsigned char   *messageId  = OSPC_OSNULL;
<     unsigned char   *compid     = OSPC_OSNULL;
242,256d223
< 
<         if(OSPPMsgGetElemPart(OSPPXMLElemGetName(ospvElem))==ospeElemMessage)
<         {
<             OSPPReauthRspMessageIdFromElement(ospvElem, &messageId);
<             OSPPReauthRspSetMessageId(reauthrsp, messageId);
< 
<             /* ospvElem is pointing to the Message element. 
<              * The first child contains the Component element. 
<              * The following two lines of code change ospvElem from 
<              * pointing to the Message element to the Component element.
<              */
<             ospvParent = ospvElem;
<             ospvElem = (OSPTXMLELEM *)OSPPXMLElemFirstChild(ospvParent);
<         }
< 
262d228
<             
265,276d230
<         else
<         {
<         /* Have to get ComponentId here */
<             if(OSPPMsgGetElemPart(OSPPXMLElemGetName(ospvElem)) == ospeElemReauthReq)
<             {
<                 OSPPReauthRspComponentIdFromElement(ospvElem, &compid);
<                 if(compid != OSPC_OSNULL)
<                 {
<                     OSPPReauthRspSetComponentId(reauthrsp, compid);
<                 }                    
<             }
<         }
291,304d244
<                 case ospeElemMessage:
<                 if(messageId != OSPC_OSNULL)
<                 {
<                     OSPPReauthRspSetMessageId(reauthrsp, messageId);
<                 }
<                 break;
< 
<                 case ospeElemReauthReq:
<                 if(compid != OSPC_OSNULL)
<                 {
<                     OSPPReauthRspSetComponentId(reauthrsp, compid);
<                 }
<                 break;
< 
350,355d289
< 
<         if(ospvParent != OSPC_OSNULL)
<         {
<             ospvElem = ospvParent;
<         }
< 
387,399d320
<         /* delete ComponentId and MessageId */
<         if(OSPPReauthRspHasComponentId(*ospvReauthRsp))
<         {
<             OSPM_FREE((*ospvReauthRsp)->ospmReauthRspComponentId);
<             (*ospvReauthRsp)->ospmReauthRspComponentId = OSPC_OSNULL;
<         }
< 
<         if(OSPPReauthRspHasMessageId(*ospvReauthRsp))
<         {
<             OSPM_FREE((*ospvReauthRsp)->ospmReauthRspMessageId);
<             (*ospvReauthRsp)->ospmReauthRspMessageId = OSPC_OSNULL;
<         }
< 
406,523d326
< 
< /*-----------------------------------------------------------------------*
<  * OSPPReauthRspHasMessageId() - is the message id set ?
<  *-----------------------------------------------------------------------*/
< unsigned                   /* returns non-zero if message id is set */
< OSPPReauthRspHasMessageId(
<     OSPTREAUTHRSP *ospvReauthRsp
< )
< {
<   return (ospvReauthRsp->ospmReauthRspMessageId != OSPC_OSNULL);
< }
< 
< /*-----------------------------------------------------------------------*
<  * OSPPReauthRspSetMessageId() - creates space and copies in the string.
<  *-----------------------------------------------------------------------*/
< void      
< OSPPReauthRspSetMessageId(
<     OSPTREAUTHRSP  *ospvReauthRsp,    /* In - pointer to Usage Indication struct */
<     unsigned char  *ospvMessageId     /* In - pointer to message id string */
<     )
< {
<     int len = OSPM_STRLEN((const char *)ospvMessageId);
< 
<     if(ospvReauthRsp != OSPC_OSNULL)
<     {
<         if(ospvReauthRsp->ospmReauthRspMessageId != OSPC_OSNULL)
<         {
<             OSPM_FREE(ospvReauthRsp->ospmReauthRspMessageId);    
<         }
< 
<         OSPM_MALLOC(ospvReauthRsp->ospmReauthRspMessageId, unsigned char, len + 1);
<         OSPM_MEMSET(ospvReauthRsp->ospmReauthRspMessageId, 0, len + 1);
<         OSPM_MEMCPY(ospvReauthRsp->ospmReauthRspMessageId, ospvMessageId, len);
<     }
< 
<     return;
< }
< 
< /* -----------------------------------------------------------------------------*
<  * OSPPReauthRspMessageIdFromElement() - Get message id attribute from element.
<  * -----------------------------------------------------------------------------*/
< void   
< OSPPReauthRspMessageIdFromElement(
<     OSPTXMLELEM *ospvElemIn, 
<     unsigned char **ospvMessageId
< )
< {
<     OSPTXMLATTR *attr = (OSPTXMLATTR *)OSPC_OSNULL;
< 
<     /* look for the message id attribute */
<     for (attr = (OSPTXMLATTR *)OSPPXMLElemFirstAttr(ospvElemIn);
<         (attr != (OSPTXMLATTR *)OSPC_OSNULL);
<         attr = (OSPTXMLATTR *)OSPPXMLElemNextAttr(ospvElemIn, attr))
<     {
< 
<         if (OSPPMsgGetAttrPart(OSPPXMLAttrGetName(attr)) == ospeAttrMessageId)
<         {
<             /* we found the message attribute. Get the value */
<             *ospvMessageId = (unsigned char *)OSPPXMLAttrGetValue(attr);
<             break;
< 
<         }
<     }
< }