|
|
e166531 |
diff -ur globus_gass_transfer-3.4.orig/library/globus_gass_transfer_client.c globus_gass_transfer-3.4/library/globus_gass_transfer_client.c
|
|
|
e166531 |
--- globus_gass_transfer-3.4.orig/library/globus_gass_transfer_client.c 2006-01-19 06:54:50.000000000 +0100
|
|
|
b4bd5d3 |
+++ globus_gass_transfer-3.4/library/globus_gass_transfer_client.c 2009-06-14 09:26:35.000000000 +0200
|
|
|
e166531 |
@@ -533,11 +533,6 @@
|
|
|
e166531 |
* The length of the data to append to the url, if known. If this
|
|
|
e166531 |
* parameter is set to @a GLOBUS_GASS_LENGTH_UNKNOWN, then the append
|
|
|
e166531 |
* may fail if the protocol does not support arbitrarily-length files.
|
|
|
e166531 |
- * @param callback
|
|
|
e166531 |
- * Function to call once the URL has been accepted, referred, or
|
|
|
e166531 |
- * denied by the server.
|
|
|
e166531 |
- * @param user_arg
|
|
|
e166531 |
- * User-supplied argument to the callback function.
|
|
|
e166531 |
*
|
|
|
e166531 |
* @retval GLOBUS_SUCCESS
|
|
|
e166531 |
* The put was successfully initiated.
|
|
|
b4bd5d3 |
diff -ur globus_gass_transfer-3.4.orig/library/globus_gass_transfer.h globus_gass_transfer-3.4/library/globus_gass_transfer.h
|
|
|
b4bd5d3 |
--- globus_gass_transfer-3.4.orig/library/globus_gass_transfer.h 2006-01-19 06:54:50.000000000 +0100
|
|
|
b4bd5d3 |
+++ globus_gass_transfer-3.4/library/globus_gass_transfer.h 2009-06-14 09:39:51.000000000 +0200
|
|
|
b4bd5d3 |
@@ -47,8 +47,8 @@
|
|
|
b4bd5d3 |
* simple protocol-independent API.
|
|
|
b4bd5d3 |
*
|
|
|
b4bd5d3 |
* The GASS Transfer API provides a way to implement both
|
|
|
b4bd5d3 |
- * @link globus_gass_transfer_client client @endlink and
|
|
|
b4bd5d3 |
- * @link globus_gass_transfer_server server @endlink
|
|
|
b4bd5d3 |
+ * @link globus_gass_transfer_client client@endlink and
|
|
|
b4bd5d3 |
+ * @link globus_gass_transfer_server server@endlink
|
|
|
b4bd5d3 |
* components. These share common data block and request management
|
|
|
b4bd5d3 |
* functionality. Client-specific functions are provided to implement file
|
|
|
b4bd5d3 |
* "get", "put", and "append" operations. Server-specific functions are
|
|
|
b4bd5d3 |
@@ -62,7 +62,7 @@
|
|
|
b4bd5d3 |
* server-side support for the http and https protocols.
|
|
|
b4bd5d3 |
* An application which requires additional
|
|
|
b4bd5d3 |
* protocol support may add this through the @link
|
|
|
b4bd5d3 |
- * globus_gass_transfer_protocol protocol module interface @endlink.
|
|
|
b4bd5d3 |
+ * globus_gass_transfer_protocol protocol module interface@endlink.
|
|
|
b4bd5d3 |
*
|
|
|
b4bd5d3 |
* The GASS Transfer API is defined in the header file
|
|
|
b4bd5d3 |
* "globus_gass_transfer.h"
|
|
|
b4bd5d3 |
@@ -122,9 +122,9 @@
|
|
|
b4bd5d3 |
* For server operations, the request is initialized by calling
|
|
|
b4bd5d3 |
* globus_gass_transfer_accept().
|
|
|
b4bd5d3 |
*
|
|
|
b4bd5d3 |
- * The functions in the @link globus_gass_transfer_request request section
|
|
|
b4bd5d3 |
- * @endlink of this manual describe the functions available for accessing
|
|
|
b4bd5d3 |
- * information from a request handle.
|
|
|
b4bd5d3 |
+ * The functions in the @link globus_gass_transfer_request request
|
|
|
b4bd5d3 |
+ * section@endlink of this manual describe the functions available for
|
|
|
b4bd5d3 |
+ * accessing information from a request handle.
|
|
|
b4bd5d3 |
*
|
|
|
b4bd5d3 |
* Each request handle should be destroyed by calling
|
|
|
b4bd5d3 |
* globus_gass_transfer_request_destroy() once the user has completed
|
|
|
b4bd5d3 |
@@ -340,7 +340,7 @@
|
|
|
b4bd5d3 |
* file transfers. The operations supported by the GASS Transfer API
|
|
|
b4bd5d3 |
* are file get, put, and append. These operations are provided for
|
|
|
b4bd5d3 |
* HTTP, and HTTPS file servers. The @link
|
|
|
b4bd5d3 |
- * globus_gass_transfer_protocol protocol module interface @endlink
|
|
|
b4bd5d3 |
+ * globus_gass_transfer_protocol protocol module interface@endlink
|
|
|
b4bd5d3 |
* allows support for additional protocols to be added
|
|
|
b4bd5d3 |
* easily.
|
|
|
b4bd5d3 |
*
|
|
|
e166531 |
diff -ur globus_gass_transfer-3.4.orig/library/globus_gass_transfer_proto.c globus_gass_transfer-3.4/library/globus_gass_transfer_proto.c
|
|
|
e166531 |
--- globus_gass_transfer-3.4.orig/library/globus_gass_transfer_proto.c 2006-01-19 06:54:50.000000000 +0100
|
|
|
b4bd5d3 |
+++ globus_gass_transfer-3.4/library/globus_gass_transfer_proto.c 2009-06-14 09:36:49.000000000 +0200
|
|
|
b4bd5d3 |
@@ -150,9 +150,9 @@
|
|
|
b4bd5d3 |
* This function notifies the GASS Transfer Library that the protocol module
|
|
|
e166531 |
* has decided that a new request can be accepted on this particular listener.
|
|
|
e166531 |
* It must only be called after the GASS Transfer Library has called the
|
|
|
b4bd5d3 |
- * @link globus_gass_transfer_listener_proto_t::listen listen function @endlink
|
|
|
b4bd5d3 |
+ * @link globus_gass_transfer_listener_proto_s::listen listen function@endlink
|
|
|
b4bd5d3 |
* in a @link #globus_gass_transfer_listener_proto_t protocol module-specific
|
|
|
b4bd5d3 |
- * listener structure.
|
|
|
b4bd5d3 |
+ * listener structure@endlink.
|
|
|
e166531 |
*
|
|
|
e166531 |
* @param listener
|
|
|
b4bd5d3 |
* The listener handle which is now ready for accepting a new
|
|
|
b4bd5d3 |
diff -ur globus_gass_transfer-3.4.orig/library/globus_gass_transfer_proto.h globus_gass_transfer-3.4/library/globus_gass_transfer_proto.h
|
|
|
b4bd5d3 |
--- globus_gass_transfer-3.4.orig/library/globus_gass_transfer_proto.h 2006-01-19 06:54:50.000000000 +0100
|
|
|
b4bd5d3 |
+++ globus_gass_transfer-3.4/library/globus_gass_transfer_proto.h 2009-06-14 10:14:51.000000000 +0200
|
|
|
b4bd5d3 |
@@ -65,8 +65,8 @@
|
|
|
b4bd5d3 |
* must be called after the #GLOBUS_GASS_TRANSFER_MODULE has already been
|
|
|
b4bd5d3 |
* activated. Once registered, applications may use URLs of the scheme type
|
|
|
b4bd5d3 |
* provided by the protocol module for the standard @link
|
|
|
b4bd5d3 |
- * globus_gass_transfer_client client @endlink or @link
|
|
|
b4bd5d3 |
- * globus_gass_transfer_server server @endlink operations.
|
|
|
b4bd5d3 |
+ * globus_gass_transfer_client client@endlink or @link
|
|
|
b4bd5d3 |
+ * globus_gass_transfer_server server@endlink operations.
|
|
|
b4bd5d3 |
*/
|
|
|
b4bd5d3 |
|
|
|
b4bd5d3 |
#ifndef GLOBUS_GASS_INCLUDE_GLOBUS_GASS_PROTO_H
|
|
|
b4bd5d3 |
@@ -88,9 +88,17 @@
|
|
|
b4bd5d3 |
EXTERN_C_BEGIN
|
|
|
b4bd5d3 |
|
|
|
b4bd5d3 |
/* Module-specific types */
|
|
|
b4bd5d3 |
+/**
|
|
|
b4bd5d3 |
+ * Protocol module request handling structure.
|
|
|
b4bd5d3 |
+ * @ingroup globus_gass_transfer_protocol
|
|
|
b4bd5d3 |
+ * @see #globus_gass_transfer_request_proto_s */
|
|
|
b4bd5d3 |
typedef struct globus_gass_transfer_request_proto_s
|
|
|
b4bd5d3 |
globus_gass_transfer_request_proto_t;
|
|
|
b4bd5d3 |
|
|
|
b4bd5d3 |
+/**
|
|
|
b4bd5d3 |
+ * Protocol module listener handling structure.
|
|
|
b4bd5d3 |
+ * @ingroup globus_gass_transfer_protocol
|
|
|
b4bd5d3 |
+ * @see #globus_gass_transfer_listener_proto_s */
|
|
|
b4bd5d3 |
typedef struct globus_gass_transfer_listener_proto_s
|
|
|
b4bd5d3 |
globus_gass_transfer_listener_proto_t;
|
|
|
b4bd5d3 |
|
|
|
b4bd5d3 |
@@ -223,7 +231,7 @@
|
|
|
b4bd5d3 |
* A protocol-specific attribute set, created by calling the
|
|
|
b4bd5d3 |
* protocol module's
|
|
|
b4bd5d3 |
* @link globus_gass_transfer_proto_descriptor_t::new_requestattr
|
|
|
b4bd5d3 |
- * new_requestattr function pointer @endlink.
|
|
|
b4bd5d3 |
+ * new_requestattr function pointer@endlink.
|
|
|
b4bd5d3 |
*/
|
|
|
b4bd5d3 |
typedef void
|
|
|
b4bd5d3 |
(* globus_gass_transfer_proto_new_request_t)(
|
|
|
b4bd5d3 |
@@ -246,7 +254,7 @@
|
|
|
b4bd5d3 |
* A protocol-specific attribute set, created by calling the
|
|
|
b4bd5d3 |
* protocol module's
|
|
|
b4bd5d3 |
* @link globus_gass_transfer_proto_descriptor_t::new_listenerattr
|
|
|
b4bd5d3 |
- * new_listenerattr function pointer @endlink.
|
|
|
b4bd5d3 |
+ * new_listenerattr function pointer@endlink.
|
|
|
b4bd5d3 |
* @param scheme
|
|
|
b4bd5d3 |
* The URL scheme that the server has requested for the new listener.
|
|
|
b4bd5d3 |
* This will be one the scheme associated with a particular
|
|
|
b4bd5d3 |
@@ -368,16 +376,16 @@
|
|
|
b4bd5d3 |
globus_gass_transfer_requestattr_t * attr);
|
|
|
b4bd5d3 |
|
|
|
b4bd5d3 |
/**
|
|
|
b4bd5d3 |
- * @struct globus_gass_transfer_request_proto_t
|
|
|
b4bd5d3 |
+ * @struct globus_gass_transfer_request_proto_s
|
|
|
b4bd5d3 |
* Protocol module request handling structure.
|
|
|
b4bd5d3 |
* @ingroup globus_gass_transfer_protocol
|
|
|
b4bd5d3 |
*
|
|
|
b4bd5d3 |
* This structure is created by a GASS transfer protocol module to
|
|
|
b4bd5d3 |
* handle a particular request. It is created in response to a
|
|
|
b4bd5d3 |
- * @link globus_gass_transfer_listener_proto_t::accept
|
|
|
b4bd5d3 |
- * listener's accept method @endlink or a @link
|
|
|
b4bd5d3 |
+ * @link globus_gass_transfer_listener_proto_s::accept
|
|
|
b4bd5d3 |
+ * listener's accept method@endlink or a @link
|
|
|
b4bd5d3 |
* globus_gass_transfer_proto_descriptor_t::new_request
|
|
|
b4bd5d3 |
- * protocol module's new_request method @endlink.
|
|
|
b4bd5d3 |
+ * protocol module's new_request method@endlink.
|
|
|
b4bd5d3 |
*
|
|
|
b4bd5d3 |
* Memory management of this structure is the responsibility of the protocol
|
|
|
b4bd5d3 |
* module. The destroy method will be called when the GASS Transfer library
|
|
|
b4bd5d3 |
@@ -431,7 +439,7 @@
|
|
|
b4bd5d3 |
};
|
|
|
b4bd5d3 |
|
|
|
b4bd5d3 |
/**
|
|
|
b4bd5d3 |
- * @struct globus_gass_transfer_listener_proto_t
|
|
|
b4bd5d3 |
+ * @struct globus_gass_transfer_listener_proto_s
|
|
|
b4bd5d3 |
* Protocol module listener handling structure.
|
|
|
b4bd5d3 |
* @ingroup globus_gass_transfer_protocol
|
|
|
b4bd5d3 |
*/
|
|
|
e166531 |
diff -ur globus_gass_transfer-3.4.orig/library/globus_gass_transfer_request.c globus_gass_transfer-3.4/library/globus_gass_transfer_request.c
|
|
|
e166531 |
--- globus_gass_transfer-3.4.orig/library/globus_gass_transfer_request.c 2006-01-19 06:54:50.000000000 +0100
|
|
|
b4bd5d3 |
+++ globus_gass_transfer-3.4/library/globus_gass_transfer_request.c 2009-06-14 09:38:41.000000000 +0200
|
|
|
b4bd5d3 |
@@ -41,7 +41,7 @@
|
|
|
b4bd5d3 |
* @param request
|
|
|
b4bd5d3 |
* The request to query.
|
|
|
b4bd5d3 |
*
|
|
|
b4bd5d3 |
- * @return The @link #globus_gass_transfer_request_type_t type @endlink
|
|
|
b4bd5d3 |
+ * @return The @link #globus_gass_transfer_request_type_t type@endlink
|
|
|
b4bd5d3 |
* of the request.
|
|
|
b4bd5d3 |
*/
|
|
|
b4bd5d3 |
globus_gass_transfer_request_type_t
|
|
|
e166531 |
@@ -627,9 +627,9 @@
|
|
|
e166531 |
*
|
|
|
e166531 |
* @param request
|
|
|
e166531 |
* The request to destroy.
|
|
|
e166531 |
- * @param GLOBUS_SUCCESS
|
|
|
e166531 |
+ * @retval GLOBUS_SUCCESS
|
|
|
e166531 |
* The request handle reference was successfully destroyed.
|
|
|
e166531 |
- * @param GLOBUS_GASS_TRANSFER_ERROR_INVALID_USE
|
|
|
e166531 |
+ * @retval GLOBUS_GASS_TRANSFER_ERROR_INVALID_USE
|
|
|
e166531 |
* Either an invalid request handle or one which is actively being
|
|
|
e166531 |
* used was passed to this function as the @a request parameter.
|
|
|
e166531 |
*/
|
|
|
e166531 |
diff -ur globus_gass_transfer-3.4.orig/library/globus_gass_transfer_server.c globus_gass_transfer-3.4/library/globus_gass_transfer_server.c
|
|
|
e166531 |
--- globus_gass_transfer-3.4.orig/library/globus_gass_transfer_server.c 2006-01-19 06:54:50.000000000 +0100
|
|
|
b4bd5d3 |
+++ globus_gass_transfer-3.4/library/globus_gass_transfer_server.c 2009-06-14 09:26:35.000000000 +0200
|
|
|
e166531 |
@@ -302,6 +302,8 @@
|
|
|
e166531 |
* @param request
|
|
|
e166531 |
* A pointer to a new request handle. This request handle will
|
|
|
e166531 |
* be initialized when the callback function is invoked.
|
|
|
e166531 |
+ * @param attr
|
|
|
e166531 |
+ * Request attributes.
|
|
|
e166531 |
* @param listener
|
|
|
e166531 |
* The listener handle to register for the new request.
|
|
|
e166531 |
* @param callback
|