tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp14.h
Date Mon, 08 Nov 2004 13:25:57 GMT
mturk       2004/11/08 05:25:57

  Modified:    jk/native/common jk_ajp14.h
  Log:
  Format code
  
  Revision  Changes    Path
  1.14      +72 -72    jakarta-tomcat-connectors/jk/native/common/jk_ajp14.h
  
  Index: jk_ajp14.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- jk_ajp14.h	8 Oct 2004 07:50:40 -0000	1.13
  +++ jk_ajp14.h	8 Nov 2004 13:25:57 -0000	1.14
  @@ -208,96 +208,96 @@
   /*
    * The login structure
    */
  -    typedef struct jk_login_service jk_login_service_t;
  +typedef struct jk_login_service jk_login_service_t;
   
  -    struct jk_login_service
  -    {
  +struct jk_login_service
  +{
   
  -        /*
  -         *  Pointer to web-server name
  -         */
  -        char *web_server_name;
  -
  -        /*
  -         * Pointer to servlet-engine name
  -         */
  -        char *servlet_engine_name;
  -
  -        /*
  -         * Pointer to secret key
  -         */
  -        char *secret_key;
  -
  -        /*
  -         * Received entropy seed
  -         */
  -        char entropy[AJP14_ENTROPY_SEED_LEN + 1];
  -
  -        /*
  -         * Computed key
  -         */
  -        char computed_key[AJP14_COMPUTED_KEY_LEN + 1];
  -
  -        /*
  -         *  What we want to negociate
  -         */
  -        unsigned long negociation;
  -
  -        /*
  -         * What we received from servlet engine 
  -         */
  -        unsigned long negociated;
  -    };
  +    /*
  +     *  Pointer to web-server name
  +     */
  +    char *web_server_name;
  +
  +    /*
  +     * Pointer to servlet-engine name
  +     */
  +    char *servlet_engine_name;
  +
  +    /*
  +     * Pointer to secret key
  +     */
  +    char *secret_key;
  +
  +    /*
  +     * Received entropy seed
  +     */
  +    char entropy[AJP14_ENTROPY_SEED_LEN + 1];
  +
  +    /*
  +     * Computed key
  +     */
  +    char computed_key[AJP14_COMPUTED_KEY_LEN + 1];
  +
  +    /*
  +     *  What we want to negociate
  +     */
  +    unsigned long negociation;
  +
  +    /*
  +     * What we received from servlet engine 
  +     */
  +    unsigned long negociated;
  +};
   
   /*
    * functions defined here 
    */
   
  -    void ajp14_compute_md5(jk_login_service_t *s, jk_logger_t *l);
  +void ajp14_compute_md5(jk_login_service_t *s, jk_logger_t *l);
   
  -    int ajp14_marshal_login_init_into_msgb(jk_msg_buf_t *msg,
  -                                           jk_login_service_t *s,
  -                                           jk_logger_t *l);
  -
  -    int ajp14_unmarshal_login_seed(jk_msg_buf_t *msg,
  -                                   jk_login_service_t *s, jk_logger_t *l);
  -
  -    int ajp14_marshal_login_comp_into_msgb(jk_msg_buf_t *msg,
  -                                           jk_login_service_t *s,
  -                                           jk_logger_t *l);
  +int ajp14_marshal_login_init_into_msgb(jk_msg_buf_t *msg,
  +                                       jk_login_service_t *s,
  +                                       jk_logger_t *l);
   
  -    int ajp14_unmarshal_log_ok(jk_msg_buf_t *msg,
  +int ajp14_unmarshal_login_seed(jk_msg_buf_t *msg,
                                  jk_login_service_t *s, jk_logger_t *l);
   
  -    int ajp14_unmarshal_log_nok(jk_msg_buf_t *msg, jk_logger_t *l);
  +int ajp14_marshal_login_comp_into_msgb(jk_msg_buf_t *msg,
  +                                       jk_login_service_t *s,
  +                                       jk_logger_t *l);
   
  -    int ajp14_marshal_shutdown_into_msgb(jk_msg_buf_t *msg,
  -                                         jk_login_service_t *s,
  -                                         jk_logger_t *l);
  +int ajp14_unmarshal_log_ok(jk_msg_buf_t *msg,
  +                           jk_login_service_t *s, jk_logger_t *l);
   
  -    int ajp14_unmarshal_shutdown_nok(jk_msg_buf_t *msg, jk_logger_t *l);
  +int ajp14_unmarshal_log_nok(jk_msg_buf_t *msg, jk_logger_t *l);
   
  -    int ajp14_marshal_unknown_packet_into_msgb(jk_msg_buf_t *msg,
  -                                               jk_msg_buf_t *unk,
  -                                               jk_logger_t *l);
  +int ajp14_marshal_shutdown_into_msgb(jk_msg_buf_t *msg,
  +                                     jk_login_service_t *s,
  +                                     jk_logger_t *l);
   
  -    int ajp14_marshal_context_query_into_msgb(jk_msg_buf_t *msg,
  -                                              char *virtual, jk_logger_t *l);
  +int ajp14_unmarshal_shutdown_nok(jk_msg_buf_t *msg, jk_logger_t *l);
   
  -    int ajp14_unmarshal_context_info(jk_msg_buf_t *msg,
  -                                     jk_context_t *context, jk_logger_t *l);
  +int ajp14_marshal_unknown_packet_into_msgb(jk_msg_buf_t *msg,
  +                                           jk_msg_buf_t *unk,
  +                                           jk_logger_t *l);
   
  -    int ajp14_marshal_context_state_into_msgb(jk_msg_buf_t *msg,
  -                                              jk_context_t *context,
  -                                              char *cname, jk_logger_t *l);
  +int ajp14_marshal_context_query_into_msgb(jk_msg_buf_t *msg,
  +                                          char *virtual, jk_logger_t *l);
   
  -    int ajp14_unmarshal_context_state_reply(jk_msg_buf_t *msg,
  -                                            jk_context_t *context,
  -                                            jk_logger_t *l);
  +int ajp14_unmarshal_context_info(jk_msg_buf_t *msg,
  +                                 jk_context_t *context, jk_logger_t *l);
   
  -    int ajp14_unmarshal_context_update_cmd(jk_msg_buf_t *msg,
  -                                           jk_context_t *context,
  -                                           jk_logger_t *l);
  +int ajp14_marshal_context_state_into_msgb(jk_msg_buf_t *msg,
  +                                          jk_context_t *context,
  +                                          char *cname, jk_logger_t *l);
  +
  +int ajp14_unmarshal_context_state_reply(jk_msg_buf_t *msg,
  +                                        jk_context_t *context,
  +                                        jk_logger_t *l);
  +
  +int ajp14_unmarshal_context_update_cmd(jk_msg_buf_t *msg,
  +                                       jk_context_t *context,
  +                                       jk_logger_t *l);
   
   #ifdef __cplusplus
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message