walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] continue work on getting API to use off_t instead of long toward LFS support in JPIP (auxtrans_manager)

This commit is contained in:
Mathieu Malaterre 2012-03-26 14:14:19 +00:00
parent 34af05ec30
commit ccdfaa9115
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
applications/jpip/libopenjpip/auxtrans_manager.c
View File

@ -82,15 +82,15 @@ void close_aux_transport( auxtrans_param_t auxtrans)
typedef struct aux_response_param{ typedef struct aux_response_param{
char *cid; /*!< channel ID */ char *cid; /*!< channel ID */
unsigned char *data; /*!< sending data */ unsigned char *data; /*!< sending data */
int datalen; /*!< length of data */ OPJ_SIZE_T datalen; /*!< length of data */
int maxlenPerFrame; /*!< maximum data length to send per frame */ OPJ_SIZE_T maxlenPerFrame; /*!< maximum data length to send per frame */
SOCKET listensock; /*!< listeing socket */ SOCKET listensock; /*!< listeing socket */
#ifdef _WIN32 #ifdef _WIN32
HANDLE hTh; /*!< thread handle */ HANDLE hTh; /*!< thread handle */
#endif #endif
} aux_response_param_t; } aux_response_param_t;
aux_response_param_t * gene_auxresponse( bool istcp, auxtrans_param_t auxtrans, char cid[], void *data, int datalen, int maxlenPerFrame); aux_response_param_t * gene_auxresponse( bool istcp, auxtrans_param_t auxtrans, char cid[], void *data, OPJ_SIZE_T datalen, OPJ_SIZE_T maxlenPerFrame);
void delete_auxresponse( aux_response_param_t **auxresponse); void delete_auxresponse( aux_response_param_t **auxresponse);
@ -101,7 +101,7 @@ unsigned __stdcall aux_streaming( void *arg);
void * aux_streaming( void *arg); void * aux_streaming( void *arg);
#endif #endif
void send_responsedata_on_aux( bool istcp, auxtrans_param_t auxtrans, char cid[], void *data, int datalen, int maxlenPerFrame) void send_responsedata_on_aux( bool istcp, auxtrans_param_t auxtrans, char cid[], void *data, OPJ_SIZE_T datalen, OPJ_SIZE_T maxlenPerFrame)
{ {
aux_response_param_t *auxresponse; aux_response_param_t *auxresponse;
#ifdef _WIN32 #ifdef _WIN32
@ -133,7 +133,7 @@ void send_responsedata_on_aux( bool istcp, auxtrans_param_t auxtrans, char cid[]
fprintf( FCGI_stderr, "Error: error in send_responsedata_on_aux(), udp not implemented\n"); fprintf( FCGI_stderr, "Error: error in send_responsedata_on_aux(), udp not implemented\n");
} }
aux_response_param_t * gene_auxresponse( bool istcp, auxtrans_param_t auxtrans, char cid[], void *data, int datalen, int maxlenPerFrame) aux_response_param_t * gene_auxresponse( bool istcp, auxtrans_param_t auxtrans, char cid[], void *data, OPJ_SIZE_T datalen, OPJ_SIZE_T maxlenPerFrame)
{ {
aux_response_param_t *auxresponse; aux_response_param_t *auxresponse;
@ -175,8 +175,8 @@ void * aux_streaming( void *arg)
{ {
SOCKET connected_socket; SOCKET connected_socket;
unsigned char *chunk, *ptr; unsigned char *chunk, *ptr;
int maxLenOfBody, remlen, chunklen; OPJ_SIZE_T maxLenOfBody, remlen, chunklen;
const int headlen = 8; const OPJ_SIZE_T headlen = 8;
aux_response_param_t *auxresponse = (aux_response_param_t *)arg; aux_response_param_t *auxresponse = (aux_response_param_t *)arg;

2
applications/jpip/libopenjpip/auxtrans_manager.h
View File

@ -67,6 +67,6 @@ void close_aux_transport( auxtrans_param_t auxtrans);
* @param[in] length length of data * @param[in] length length of data
* @param[in] maxlenPerFrame maximum data length to send per frame * @param[in] maxlenPerFrame maximum data length to send per frame
*/ */
void send_responsedata_on_aux( bool istcp, auxtrans_param_t auxtrans, char cid[], void *data, int length, int maxlenPerFrame); void send_responsedata_on_aux( bool istcp, auxtrans_param_t auxtrans, char cid[], void *data, OPJ_SIZE_T length, OPJ_SIZE_T maxlenPerFrame);
#endif /* !AUXTRANS_MANAGER_H_ */ #endif /* !AUXTRANS_MANAGER_H_ */

2
applications/jpip/libopenjpip/sock_manager.c
View File

@ -97,7 +97,7 @@ SOCKET accept_socket( SOCKET listening_socket)
return accept( listening_socket, (struct sockaddr *)&peer_sin, &addrlen); return accept( listening_socket, (struct sockaddr *)&peer_sin, &addrlen);
} }
void send_stream( SOCKET connected_socket, void *stream, int length) void send_stream( SOCKET connected_socket, void *stream, OPJ_SIZE_T length)
{ {
char *ptr = (char*)stream; char *ptr = (char*)stream;
int remlen = length; int remlen = length;

2
applications/jpip/libopenjpip/sock_manager.h
View File

@ -92,7 +92,7 @@ void * receive_stream( SOCKET connected_socket, int length);
* @param [in] stream data stream * @param [in] stream data stream
* @param [in] length length of data stream * @param [in] length length of data stream
*/ */
void send_stream( SOCKET connected_socket, void *stream, int length); void send_stream( SOCKET connected_socket, void *stream, OPJ_SIZE_T length);
/** /**
* close socket * close socket