Skip to content

Commit

Permalink
Update with changes to fix several bugs and reduce compiler warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@bendailey
Israel Brewster authored and bendailey committed Dec 1, 2015
1 parent 3b8f37d commit bfeb4ea
Show file tree
Hide file tree
Showing 8 changed files with 197 additions and 105 deletions.
12 changes: 6 additions & 6 deletions lib4d_sql/base64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ static const short base64_reverse_table[256] = {

/* {{{ php_base64_encode */
//PHPAPI
unsigned char *base64_encode(const unsigned char *str, int length, int *ret_length)
unsigned char *base64_encode(const char *str, size_t length, int *ret_length)
{
const unsigned char *current = str;
const char *current = str;
unsigned char *p;
unsigned char *result;

if ((length + 2) < 0 || ((length + 2) / 3) >= (1 << (sizeof(int) * 8 - 2))) {
if (((length + 2) / 3) >= (1 << (sizeof(int) * 8 - 2))) {
if (ret_length != NULL) {
*ret_length = 0;
}
Expand Down Expand Up @@ -138,17 +138,17 @@ void php_base64_init(void)
/* }}} */

//PHPAPI
unsigned char *base64_decode(const unsigned char *str, int length, int *ret_length)
unsigned char *base64_decode(const char *str, size_t length, int *ret_length)
{
return base64_decode_ex(str, length, ret_length, 0);
}

/* {{{ php_base64_decode */
/* as above, but backwards. :) */
//PHPAPI
unsigned char *base64_decode_ex(const unsigned char *str, int length, int *ret_length, int strict)
unsigned char *base64_decode_ex(const char *str, size_t length, int *ret_length, int strict)
{
const unsigned char *current = str;
const char *current = str;
int ch, i = 0, j = 0, k;
/* this sucks for threaded environments */
unsigned char *result;
Expand Down
6 changes: 3 additions & 3 deletions lib4d_sql/base64.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
//PHP_FUNCTION(base64_encode);

//PHPAPI extern
unsigned char *base64_encode(const unsigned char *, int, int *);
unsigned char *base64_encode(const char *, size_t, int *);
//PHPAPI extern
unsigned char *base64_decode_ex(const unsigned char *, int, int *, int);
unsigned char *base64_decode_ex(const char *, size_t, int *, int);
//PHPAPI extern
unsigned char *base64_decode(const unsigned char *, int, int *);
unsigned char *base64_decode(const char *, size_t, int *);

#endif /* BASE64_H */

Expand Down
53 changes: 28 additions & 25 deletions lib4d_sql/communication.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
#include <fcntl.h>
#endif

int frecv(SOCKET s,char *buf,int len,int flags)
long frecv(SOCKET s,unsigned char *buf,int len,int flags)
{
int rec=0;
int iResult=0;
long iResult=0;
do{
iResult=recv(s,buf+rec,len-rec, 0);
if(iResult<0){
Expand Down Expand Up @@ -142,7 +142,6 @@ int socket_connect(FOURD *cnx,const char *host,unsigned int port)

void socket_disconnect(FOURD *cnx)
{
int iResult=0;
// shutdown the send half of the connection since no more data will be sent
#ifdef WIN32
iResult = shutdown(cnx->socket, SD_SEND);
Expand All @@ -157,9 +156,10 @@ void socket_disconnect(FOURD *cnx)
cnx->connected=0;
//Printf("Disconnect ok\n");
}

int socket_send(FOURD *cnx,const char*msg)
{
int iResult;
long iResult;
//Printf("Send-len:%d\n",strlen(msg))
Printf("Send:\n%s",msg);
// Send an initial buffer
Expand All @@ -173,7 +173,7 @@ int socket_send(FOURD *cnx,const char*msg)
}
int socket_send_data(FOURD *cnx,const char*msg,int len)
{
int iResult;
long iResult;
Printf("Send:%d bytes\n",len);
PrintData(msg,len);
Printf("\n");
Expand All @@ -189,11 +189,10 @@ int socket_send_data(FOURD *cnx,const char*msg,int len)

int socket_receiv_header(FOURD *cnx,FOURD_RESULT *state)
{
int iResult=0;
long iResult=0;
int offset=0;
int len=0;
int crlf=0;
char *fin_header=NULL;
//read the HEADER only
do
{
Expand Down Expand Up @@ -225,17 +224,16 @@ int socket_receiv_header(FOURD *cnx,FOURD_RESULT *state)
}
int socket_receiv_data(FOURD *cnx,FOURD_RESULT *state)
{
int iResult=0;
int offset=0;
long iResult=0;
int len=0;
int end_row=0;
//int end_row=0;
unsigned int nbCol=state->row_type.nbColumn;
unsigned int nbRow=state->row_count_sent;
unsigned int r,c;
FOURD_TYPE *colType=NULL;
FOURD_TYPE *colType;
FOURD_ELEMENT *pElmt=NULL;
char status_code=0;
int elmt_size=0;
unsigned char status_code=0;
//int elmt_size=0;
int elmts_offset=0;
Printf("---Debut de socket_receiv_data\n");
colType=calloc(nbCol,sizeof(FOURD_TYPE));
Expand Down Expand Up @@ -266,13 +264,13 @@ int socket_receiv_data(FOURD *cnx,FOURD_RESULT *state)
break;
case '1':
/* pElmt->elmt=calloc(vk_sizeof(colType[0]),1); */
iResult = frecv(cnx->socket,(char*)&row_id,sizeof(row_id), 0);
iResult = frecv(cnx->socket,(unsigned char*)&row_id,sizeof(row_id), 0);
/* Printf("row_id:%d\n",row_id); */
len+=iResult;
break;
case '2':
Printferr("Error during reading data\n");
iResult = frecv(cnx->socket,(char*)&(state->error_code),sizeof(state->error_code), 0);
iResult = frecv(cnx->socket,(unsigned char*)&(state->error_code),sizeof(state->error_code), 0);
len+=iResult;
return 1; /* return on error */
break;
Expand All @@ -299,7 +297,7 @@ int socket_receiv_data(FOURD *cnx,FOURD_RESULT *state)
{
case '2'://error
Printferr("Error during reading data\n");
iResult = frecv(cnx->socket,(char*)&(state->error_code),sizeof(state->error_code), 0);
iResult = frecv(cnx->socket,(unsigned char*)&(state->error_code),sizeof(state->error_code), 0);
len+=iResult;
return 1;//on sort en erreur
break;
Expand Down Expand Up @@ -328,7 +326,7 @@ int socket_receiv_data(FOURD *cnx,FOURD_RESULT *state)
FOURD_TIMESTAMP *tmp;
tmp=calloc(1,sizeof(FOURD_TIMESTAMP));
pElmt->pValue=tmp;
iResult = frecv(cnx->socket,(char*)&(tmp->year),sizeof(short), 0);
iResult = frecv(cnx->socket,(unsigned char*)&(tmp->year),sizeof(short), 0);
Printf("year: %04X",tmp->year);
len+=iResult;
iResult = frecv(cnx->socket,&(tmp->mounth),sizeof(char), 0);
Expand All @@ -337,7 +335,7 @@ int socket_receiv_data(FOURD *cnx,FOURD_RESULT *state)
iResult = frecv(cnx->socket,&(tmp->day),sizeof(char), 0);
Printf(" day: %02X",tmp->day);
len+=iResult;
iResult = frecv(cnx->socket,(char*)&(tmp->milli),sizeof(unsigned int), 0);
iResult = frecv(cnx->socket,(unsigned char*)&(tmp->milli),sizeof(unsigned int), 0);
Printf(" milli: %08X\n",tmp->milli);
len+=iResult;
}
Expand All @@ -349,11 +347,11 @@ int socket_receiv_data(FOURD *cnx,FOURD_RESULT *state)
tmp=calloc(1,sizeof(FOURD_FLOAT));
pElmt->pValue=tmp;

iResult = frecv(cnx->socket,(char*)&(tmp->exp),sizeof(int), 0);
iResult = frecv(cnx->socket,(unsigned char*)&(tmp->exp),sizeof(int), 0);
len+=iResult;
iResult = frecv(cnx->socket,&(tmp->sign),sizeof(char), 0);
len+=iResult;
iResult = frecv(cnx->socket,(char*)&(tmp->data_length),sizeof(int), 0);
iResult = frecv(cnx->socket,(unsigned char*)&(tmp->data_length),sizeof(int), 0);
len+=iResult;
iResult = frecv(cnx->socket,(tmp->data),tmp->data_length, 0);
len+=iResult;
Expand All @@ -368,7 +366,7 @@ int socket_receiv_data(FOURD *cnx,FOURD_RESULT *state)
//read negative value of length of string
str=calloc(1,sizeof(FOURD_STRING));
pElmt->pValue=str;
iResult = frecv(cnx->socket,(char*)&data_length,4, 0);
iResult = frecv(cnx->socket,(unsigned char*)&data_length,4, 0);
len+=iResult;
Printf("String length: %08X\n",data_length);
data_length=-data_length;
Expand Down Expand Up @@ -404,7 +402,7 @@ int socket_receiv_data(FOURD *cnx,FOURD_RESULT *state)
//read negative value of length of string
blob=calloc(1,sizeof(FOURD_BLOB));
pElmt->pValue=blob;
iResult = frecv(cnx->socket,(char*)&data_length,4, 0);
iResult = frecv(cnx->socket,(unsigned char*)&data_length,4, 0);
Printf("Blob length: %08X\n",data_length);
len+=iResult;
if(data_length==0){
Expand Down Expand Up @@ -438,9 +436,9 @@ int socket_receiv_data(FOURD *cnx,FOURD_RESULT *state)
int socket_receiv_update_count(FOURD *cnx,FOURD_RESULT *state)
{
FOURD_LONG8 data=0;
int iResult=0;
long iResult=0;
int len=0;
iResult = frecv(cnx->socket,(char*)&data,8, 0);
iResult = frecv(cnx->socket,(unsigned char*)&data,8, 0);
len+=iResult;
Printf("Ox%X\n",data);
cnx->updated_row=data;
Expand Down Expand Up @@ -495,7 +493,7 @@ int socket_connect_timeout(FOURD *cnx,const char *host,unsigned int port,int tim
fd_set myset;
socklen_t lon;

int nbTryConnect=0;
//int nbTryConnect=0;
char sport[50];
sprintf_s(sport,50,"%d",port);

Expand Down Expand Up @@ -538,6 +536,11 @@ int socket_connect_timeout(FOURD *cnx,const char *host,unsigned int port,int tim
freeaddrinfo(result);
return 1;
}
int flag=1;
// if we get an error here, we can safely ignore it. The connection may be slower, but it should
// still work.
setsockopt(cnx->socket, IPPROTO_TCP, TCP_NODELAY, (char *)&flag, sizeof(int));

/* Printf("Socket Ok\n"); */
/*set Non blocking socket */
set_sock_blocking(cnx->socket,0);
Expand Down
Loading

0 comments on commit bfeb4ea

Please sign in to comment.