[BACK]Return to AHTBridge.c CVS log [TXT] [DIR] Up to [Public] / Amaya / amaya

Diff for /Amaya/amaya/AHTBridge.c between versions 1.22 and 1.23

version 1.22, 1997/02/26 12:13:45 version 1.23, 1997/03/17 18:19:23
Line 15 Line 15
  *   *
  */   */
   
   #ifndef AMAYA_JAVA
   
 #define THOT_EXPORT extern  #define THOT_EXPORT extern
 #include "amaya.h"  #include "amaya.h"
 #include "AHTBridge_f.h"  #include "AHTBridge_f.h"
Line 65  static const SockOps ReadBits = FD_READ Line 67  static const SockOps ReadBits = FD_READ
 static const SockOps WriteBits = FD_WRITE | FD_CONNECT;  static const SockOps WriteBits = FD_WRITE | FD_CONNECT;
 static const SockOps ExceptBits = FD_OOB;  static const SockOps ExceptBits = FD_OOB;
   
 /*  
  * Experimental functions  
  */  
   
 #ifdef AMAYA_JAVA  
 /*--------------------------------------------------------------------  
   W3ContinueRequest  
   -------------------------------------------------------------------*/  
   
 #ifdef __STDC__  
 void W3ContinueRequest (SOCKET sock, int event)  
 #else  
 void W3ContinueRequest (SOCKET sock, int event)  
 SOCKET              socket;  
 int                 event;  
 #endif /* __STDC__ */  
 {  
    int                 status;  /* the status result of the libwwww call */  
    HTRequest          *rqp = NULL;  
    AHTReqContext      *me;  
    SockOps             ops;       
   
    /* Libwww 5.0a does not take into account the ops parameter  
       in the invocation of for this function call */  
   
 #ifdef HACK_WWW  
    HTEventCallback    *cbf;  
   
 #else  
    HTEventCallback    *cbf;  
   
    ops = FD_WRITE;  
    cbf = (HTEventCallback *) __RetrieveCBF (sock, ops, &rqp);  
 #endif  
   
    me = HTRequest_context (rqp);  
    if (THD_TRACE)  
      fprintf (stderr, "AHTBridge: Processing url %s \n", me->urlName);  
   
    /* verify if there's any callback associated with the request */  
    if (!cbf || !rqp || rqp->priority == HT_PRIORITY_OFF)  
      {  
         if (THD_TRACE)  
            HTTrace ("Callback.... No callback found\n");  
         /* experimental */  
         /* Do some error processing */  
         /* put some more code to correctly destroy this request ?*/  
         return;  
      }  
   
 #ifndef _WINDOWS  
    switch (event)  
          {  
             case 1:  
                ops = me->read_ops;  
                ops = FD_READ;  
                break;  
             case 2:  
                ops = me->write_ops;  
                ops = FD_WRITE;  
                break;  
             case 4:  
                ops = me->except_ops;  
                ops = FD_OOB;  
                break;  
          }                      /* switch */  
 #endif /* !_WINDOWS */  
   
      /* Invokes the callback associated to the requests */  
        
      /* first we change the status of the request, to say it  
         has entered a critical section */  
   
      if((HTRequest_outputStream(me->request) == (HTStream *) NULL))  
        fprintf(stderr,"\n **ERROR** opening %s\n\n",me->urlName);  
   
      me->reqStatus = HT_BUSY;  
      if ((status = (*cbf) (sock, rqp, ops)) != HT_OK)  
        HTTrace ("Callback.... received != HT_OK");  
   
    /* Several states can happen after this callback. They  
     * are indicated by the me->reqStatus structure member and  
     * the fds external variables. The following lines examine  
     * the states and correspondly update the Xt event register  
     *  
     * Regarding the me->reqStatus member, we have the following  
     * possible states:  
     *     
     * HT_BUSY:    Request has blocked  
     * HT_WAITING: Request has been reissued  
     * HT_ABORT:   Request has been stopped  
     * HT_END:     Request has ended  
     */  
   
 #ifndef _WINDOWS  
    if (me->reqStatus == HT_ABORT)  
    /* Has the user stopped the request? */  
      {  
         me->reqStatus = HT_WAITING;  
         StopRequest (me->docid);  
         return;  
      }  
 #endif /* !_WINDOWS */  
   
    if (me->reqStatus == HT_WAITING)  
    /* the request is being reissued */  
      {  
         /*  
          * (1) The old request has ended and the library  
          * assigned the old socket number to a pending  
          * request.  
          *  
          * (2) The request has been reissued after an   
          * authentication or redirection directive and  
          * we are using the same old socket number.  
          */  
          
        if (THD_TRACE)  
          fprintf (stderr, "*** detected a reissue of request \n");  
        return;  
      }  
   
     /* we verify if the request exists. If it has ended, we will have  
        a reqStatus with an HT_END value */  
   
    if ((me->request->net == (HTNet *) NULL) || (me->reqStatus == HT_END || me->reqStatus == HT_ERR))  
      /* request has ended */  
      {  
         if ((me->mode & AMAYA_ASYNC) || (me->mode & AMAYA_IASYNC))  
           /* free the memory allocated for async requests */  
           {  
              AHTPrintPendingRequestStatus (me->docid, YES);  
              AHTReqContext_delete (me);  
           }  
         else if (me->reqStatus != HT_END && HTError_hasSeverity (HTRequest_error (me->request), ERR_NON_FATAL))  
           /* did the SYNC request end because of an error? If yes, report it back to the caller */  
            me->reqStatus = HT_ERR;  
         return;  
      }  
   
    /* The request is still alive, so change it's status to indicate it's out of the  
       critical section */  
    me->reqStatus = HT_WAITING;  
    return;  
 }  
 #endif /* AMAYA_JAVA */  
   
 /*  /*
  * Private functions   * Private functions
Line 619  SOCKET sock; Line 475  SOCKET sock;
   
 #endif /* __STDC__ */  #endif /* __STDC__ */
 {  {
 #ifdef AMAYA_JAVA  
   JavaFdSetState (sock, 1);  
   me->read_sock = sock;  
   return;  
 #endif  
 #ifndef _WINDOWS  #ifndef _WINDOWS
   if (me->read_xtinput_id)    if (me->read_xtinput_id)
     {      {
Line 658  AHTReqContext      *me; Line 509  AHTReqContext      *me;
   
 #endif /* __STDC__ */  #endif /* __STDC__ */
 {  {
 #ifdef AMAYA_JAVA  
   JavaFdResetState (me->read_sock, 1);  
   me->read_sock = INVSOC;  
   return;  
 #endif  
   
 #ifndef _WINDOWS  #ifndef _WINDOWS
    if (me->read_xtinput_id)     if (me->read_xtinput_id)
      {       {
Line 688  SOCKET              sock; Line 533  SOCKET              sock;
   
 #endif /* __STDC__ */  #endif /* __STDC__ */
 {  {
 #ifdef AMAYA_JAVA  
   JavaFdSetState (sock, 2);  
   me->write_sock = sock;  
   return;  
 #endif  
 #ifndef _WINDOWS  #ifndef _WINDOWS
    if (me->write_xtinput_id)     if (me->write_xtinput_id)
     {      {
Line 727  AHTReqContext      *me; Line 567  AHTReqContext      *me;
   
 #endif /* __STDC__ */  #endif /* __STDC__ */
 {  {
 #ifdef AMAYA_JAVA  
   JavaFdResetState (me->write_sock, 2);  
   me->write_sock = INVSOC;  
   return;  
 #endif  
 #ifndef _WINDOWS  #ifndef _WINDOWS
    if (me->write_xtinput_id)     if (me->write_xtinput_id)
      {       {
Line 756  SOCKET              sock; Line 591  SOCKET              sock;
   
 #endif /* __STDC__ */  #endif /* __STDC__ */
 {  {
 #ifdef AMAYA_JAVA  
   JavaFdSetState (sock, 4);  
   me->except_sock = sock;  
   return;  
 #endif  
   
 #ifndef _WINDOWS  #ifndef _WINDOWS
    if (me->except_xtinput_id)     if (me->except_xtinput_id)
      {       {
Line 797  AHTReqContext      *me; Line 626  AHTReqContext      *me;
   
 #endif /* __STDC__ */  #endif /* __STDC__ */
 {  {
 #ifdef AMAYA_JAVA  
   JavaFdResetState (me->except_sock, 4);  
   me->except_sock = INVSOC;  
 #endif  
   
 #ifndef _WINDOWS  #ifndef _WINDOWS
    if (me->except_xtinput_id)     if (me->except_xtinput_id)
      {       {
Line 817  AHTReqContext      *me; Line 641  AHTReqContext      *me;
   End of Module AHTBridge.c    End of Module AHTBridge.c
 */  */
   
   #endif /* !AMAYA_JAVA */
   
   
   
Removed from v.1.22  
changed lines
  Added in v.1.23

Webmaster