Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions components/oap-http/esp_request.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ static char *http_auth_basic_encode(const char *username, const char *password)

static int nossl_connect(request_t *req)
{
int socket;
int socket_esp;
struct sockaddr_in remote_ip;
struct timeval tv;
req_list_t *host, *port, *timeout;
Expand All @@ -125,8 +125,8 @@ static int nossl_connect(request_t *req)
}
}

socket = socket(PF_INET, SOCK_STREAM, 0);
REQ_CHECK(socket < 0, "socket failed", return -1);
socket_esp = socket(PF_INET, SOCK_STREAM, 0);
REQ_CHECK(socket_esp < 0, "socket failed", return -1);

port = req_list_get_key(req->opt, "port");
if(port == NULL)
Expand All @@ -141,16 +141,16 @@ static int nossl_connect(request_t *req)
tv.tv_sec = atoi(timeout->value);
}
tv.tv_usec = 0;
setsockopt(socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
setsockopt(socket_esp, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));

ESP_LOGD(TAG, "[sock=%d],connecting to server IP:%s,Port:%s...",
socket, ipaddr_ntoa((const ip_addr_t*)&remote_ip.sin_addr.s_addr), (char*)port->value);
if(connect(socket, (struct sockaddr *)(&remote_ip), sizeof(struct sockaddr)) != 0) {
close(socket);
socket_esp, ipaddr_ntoa((const ip_addr_t*)&remote_ip.sin_addr.s_addr), (char*)port->value);
if(connect(socket_esp, (struct sockaddr *)(&remote_ip), sizeof(struct sockaddr)) != 0) {
close(socket_esp);
return -1;
}
req->socket = socket;
return socket;
req->socket = socket_esp;
return socket_esp;
}

void req_free_x509_crt(mbedtls_x509_crt* crt) {
Expand Down