fix [HTTP] add http at function
Change-Id: I387fd48e9e05083d8e9dd597d5c9127fc896c402
diff --git a/mbtk/include/mbtk/mbtk_http.h b/mbtk/include/mbtk/mbtk_http.h
index ad3750d..bbd0130 100755
--- a/mbtk/include/mbtk/mbtk_http.h
+++ b/mbtk/include/mbtk/mbtk_http.h
@@ -60,11 +60,6 @@
HTTP_OPTION_UNLINK
} mbtk_http_option_enum;
-typedef enum {
- HTTP_TYPE_URC = 0,
- HTTP_TYPE_EFS
-} mbtk_http_type_enum;
-
#if 0
typedef enum {
HTTP_HEADER_GENERAL = 0,
@@ -169,16 +164,6 @@
MBTK_HTTP_STATE_CODE_503 = 503
} mbtk_http_state_code_e;
-
-typedef enum {
- MBTK_HTTP_DATA_EFS_BUF = 0,
- MBTK_HTTP_DATA_EFS_SIZE,
- MBTK_HTTP_DATA_EFS_BUF_SIZE
-} mbtk_http_data_file_type_enum;
-
-typedef void (*mbtk_http_data_file_callback_func)(
- mbtk_http_data_file_type_enum type,void *data,int data_len);
-
typedef enum {
MBTK_HTTP_DATA_NON = 0,
MBTK_HTTP_DATA_HEADER,
@@ -222,7 +207,6 @@
http_session_state_e state;
char host[MBTK_HTTP_HOST_MAX + 1];
mbtk_http_option_enum option;
- mbtk_http_type_enum type;
mbtk_http_version_enum version;
char uri[MBTK_HTTP_URI_MAX + 1];
int port;
@@ -237,7 +221,6 @@
int id;
bool show_rsp_header;
mbtk_http_data_callback_func data_cb;
- mbtk_http_data_file_callback_func data_file_cb;
int session_cnt;
mbtk_http_session_t *session[HTTP_SESSION_MAX];
@@ -362,7 +345,6 @@
int mbtk_http_session_create(int handle_id, mbtk_http_option_enum option,
mbtk_http_version_enum version);
int mbtk_http_session_option_reset(int handle_id, int session_id, mbtk_http_option_enum option);
-int mbtk_http_session_type_set(int handle_id, int session_id, mbtk_http_type_enum type);
int mbtk_http_session_ingnore_cert_set(int handle_id, int session_id, bool ingnore_cert);
int mbtk_http_session_free(int handle_id,int session_id);
int mbtk_http_session_url_set(int handle_id,int session_id,void *url);
@@ -374,8 +356,6 @@
int mbtk_http_session_content_send(int handle_id,int session_id,
char *data,int data_len);
const mbtk_http_session_t* mbtk_http_session_get(int handle_id,int session_id);
-int mbtk_http_read_file_data(int handle_id, int session_id,
- mbtk_http_data_file_type_enum type,int offset, mbtk_http_data_file_callback_func data_file_cb);
#ifdef __cplusplus
diff --git a/mbtk/mbtk_lib/src/mbtk_http.c b/mbtk/mbtk_lib/src/mbtk_http.c
index b7ab671..a50b8e5 100755
--- a/mbtk/mbtk_lib/src/mbtk_http.c
+++ b/mbtk/mbtk_lib/src/mbtk_http.c
@@ -21,9 +21,6 @@
/*************************************************************
Constants and Macros
*************************************************************/
-#define BUFFER_SIZE 1024
-
-
/*************************************************************
Variables:local
@@ -499,7 +496,6 @@
char line[BUFFER_SIZE];
char *ptr = NULL;
int len = 0;
- int write_len = 0;
while((len = mbtk_http_read_line(session->sock_fd,line,BUFFER_SIZE)) > 0)
{
if(!memcmp(line,"\r\n",2))
@@ -507,7 +503,7 @@
LOGD("Read empty line.");
break;
}
-
+
// Delete "\r\n"
ptr = line + len - 1; // Point to last char.
while(http_is_space_char(*ptr))
@@ -518,29 +514,13 @@
}
LOGV("LINE:%s",line);
- if(session->type)
- {
- /*
- if(session->file_fd >= 0)
- {
- write_len = write(session->file_fd, line, len);
- if(write_len < len) {
- LOGE("write() fail.");
- return -1;
- }
- }
- */
- }
- else
- {
- if(http_handles[session->handle_id].show_rsp_header &&
- http_handles[session->handle_id].data_cb)
- {
- http_handles[session->handle_id].data_cb(session->id,
- MBTK_HTTP_DATA_HEADER,line,len);
- }
- }
+ if(http_handles[session->handle_id].show_rsp_header &&
+ http_handles[session->handle_id].data_cb)
+ {
+ http_handles[session->handle_id].data_cb(session->id,
+ MBTK_HTTP_DATA_HEADER,line,len);
+ }
if(!memcmp(line,"HTTP/",5)) // "HTTP/1.1 200 OK"
{
@@ -675,7 +655,7 @@
char read_buf[BUFFER_SIZE + 1];
int read_len = 0;
char chunk_buf[BUFFER_SIZE + 1];
- int chunk_len = 0, write_len=0;
+ int chunk_len;
http_chunk_init(&chunker);
while(TRUE)
{
@@ -697,24 +677,9 @@
LOGD("Read chunk_len:%d",chunk_len);
chunk_buf[chunk_len] = '\0';
- if(session->type)
- {
- if(session->file_fd >= 0)
- {
- write_len = write(session->file_fd, chunk_buf, chunk_len);
- if(write_len < chunk_len) {
- LOGE("write() fail.");
- return -1;
- }
- }
- }
- else
- {
- if(http_handles[session->handle_id].data_cb)
- http_handles[session->handle_id].data_cb(session->id,
- MBTK_HTTP_DATA_CONTENT,chunk_buf,chunk_len);
- usleep(100000);
- }
+ if(http_handles[session->handle_id].data_cb)
+ http_handles[session->handle_id].data_cb(session->id,
+ MBTK_HTTP_DATA_CONTENT,chunk_buf,chunk_len);
if(CHUNKE_STOP == chunk_code)
{
@@ -737,7 +702,6 @@
#define BUFFER_SIZE 2048
char read_buf[BUFFER_SIZE + 1];
int read_len = 0;
- int write_len = 0;
int64 read_count = 0;
while(TRUE)
{
@@ -752,15 +716,6 @@
if(read_count + read_len >= session->rsp.content_length) // Read data complete.
{
- if(session->file_fd >= 0)
- {
- write_len = write(session->file_fd, read_buf, read_len);
- if(write_len < read_len) {
- LOGE("write() fail.");
- return -1;
- }
- }
-
if(http_handles[session->handle_id].data_cb)
{
http_handles[session->handle_id].data_cb(session->id,
@@ -772,29 +727,11 @@
break;
}
- LOGE("read_len :%d, session->type:%d\n", read_len, session->type);
- if(session->type)
- {
- if(session->file_fd >= 0)
- {
- write_len = write(session->file_fd, read_buf, read_len);
- if(write_len < read_len) {
- LOGE("write() fail.");
- return -1;
- }
- }
- }
- else
- {
- if(http_handles[session->handle_id].data_cb)
- http_handles[session->handle_id].data_cb(session->id,
- MBTK_HTTP_DATA_CONTENT,read_buf,read_len);
- usleep(100000);
- }
+ if(http_handles[session->handle_id].data_cb)
+ http_handles[session->handle_id].data_cb(session->id,
+ MBTK_HTTP_DATA_CONTENT,read_buf,read_len);
read_count += read_len;
- LOGE("mbtk1111111111111111111111113by read_count:%d, read_len:%d\n.", read_count, read_len);
-
}
return 0;
@@ -806,7 +743,6 @@
#define BUFFER_SIZE 2048
char read_buf[BUFFER_SIZE + 1];
int read_len = 0;
- int write_len = 0;
while(TRUE)
{
read_len = mbtk_http_read(session->sock_fd,read_buf,BUFFER_SIZE,1000);
@@ -819,30 +755,12 @@
//return -1;
break;
}
-
+
read_buf[read_len] = '\0';
- if(session->type)
- {
- if(session->file_fd >= 0)
- {
- write_len = write(session->file_fd, read_buf, read_len);
- if(write_len < read_len) {
- LOGE("write() fail.");
- return -1;
- }
- }
- }
- else
- {
- if(http_handles[session->handle_id].data_cb)
- http_handles[session->handle_id].data_cb(session->id,
- MBTK_HTTP_DATA_CONTENT,read_buf,read_len);
-
- usleep(100000);
- }
- LOGE("mbtk1111111111111111111111111by general\n.");
-
+ if(http_handles[session->handle_id].data_cb)
+ http_handles[session->handle_id].data_cb(session->id,
+ MBTK_HTTP_DATA_CONTENT,read_buf,read_len);
}
if(http_handles[session->handle_id].data_cb)
@@ -857,18 +775,7 @@
{
LOGI("Start HTTP read.");
int result = 0;
-
// usleep(500000);
- if(session->type)
- {
- session->file_fd = open("/http_test.txt", O_WRONLY|O_TRUNC|O_CREAT|O_APPEND, 0666);
-
- if(session->file_fd < 0) {
- LOGE("open() fail.");
- return -1;
- }
- }
-
session->state = HTTP_SESSION_STATE_READ_HEADER;
if(http_header_read(session))
{
@@ -917,18 +824,6 @@
read_end:
session->state = HTTP_SESSION_STATE_READ_END;
- if(session->file_fd >= 0)
- {
- if(close(session->file_fd))
- {
- LOGI("close() fail file_fd:%d",session->file_fd);
- session->file_fd = -1;
- return -1;
- }
- session->file_fd = -1;
- }
-
-
LOGI("HTTP request complete[result - %d].",result);
if(http_session_close(session))
{
@@ -1170,25 +1065,6 @@
return 0;
}
-int mbtk_http_session_type_set(int handle_id, int session_id, mbtk_http_type_enum type)
-{
- if(!http_session_check(handle_id,session_id))
- {
- LOGE("Session error.");
- return -1;
- }
-
- mbtk_http_session_t *session = http_handles[handle_id].session[session_id];
- if(session->state != HTTP_SESSION_STATE_NON)
- {
- LOGE("Session state error.[%d]",session->state);
- return -1;
- }
-
- session->type = type;
- LOGE("session->type:%d, type:%d\n", session->type, type);
- return 0;
-}
int mbtk_http_session_ingnore_cert_set(int handle_id, int session_id, bool ingnore_cert)
{
@@ -1513,91 +1389,4 @@
return http_handles[handle_id].session[session_id];
}
-int mbtk_http_get_file_size(char *file_name)
-{
- int ret;
- int fd = -1;
- struct stat file_stat;
-
- LOGE("mbtk_http_get_file_size() start\n");
-
- fd = open(file_name, O_RDONLY); // ??¡§¡ã?a???t
- if (fd == -1) {
- printf("Open file %s failed\n", file_name);
- return -1;
- }
- ret = fstat(fd, &file_stat); // ??¡§¡§????t?¨¢??¡§??
- if (ret == -1) {
- printf("Get file %s stat failed\n", file_name);
- close(fd);
- return -1;
- }
- close(fd);
- LOGE("mbtk_http_get_file_size() end\n");
- return file_stat.st_size;
-}
-
-
-int mbtk_http_read_file_data(int handle_id, int session_id,
- mbtk_http_data_file_type_enum type,int offset, mbtk_http_data_file_callback_func data_file_cb)
-{
-
- if(!http_session_check(handle_id,session_id))
- {
- LOGE("Session error.");
- return -1;
- }
-
- mbtk_http_session_t *session = http_handles[handle_id].session[session_id];
- if(session != NULL)
- {
- http_handles[session->handle_id].data_file_cb = data_file_cb;
-
- if(type) //1 read file size
- {
- int size = mbtk_http_get_file_size("/http_test.txt");
- http_handles[session->handle_id].data_file_cb(type, NULL, size);
- }else //read file data
- {
- char buf[1024+1] = {0};
- int ret = 0;
-
- int fd = open("/http_test.txt", O_RDONLY);
- if (fd == -1) {
- printf("Open file %s failed\n", "/http_test.txt");
- return -1;
- }
-
- if(offset)
- {
- lseek(fd, offset, SEEK_SET);
- }
-// usleep(500000);
- int index = 0;
- while(1)
- {
- memset(buf,0, sizeof(buf));
- ret = read(fd, buf, 1024);
- printf("ret = %d , ", ret);
- usleep(100000);
- LOGE("mbtk, read file:%s\n", buf);
- if(ret <= 0)
- break;
-
- http_handles[session->handle_id].data_file_cb(type, buf, ret);
- index++;
- }
- close(fd);
- printf("%d\n", index);
-
- LOGE("read()end index;:%d, ret:%d",index,ret);
- }
- }
-
-
- return 0;
-}
-
-
-