Compare commits
11 Commits
2dd40d6a5b
...
7ecba4e0d5
| Author | SHA1 | Date | |
|---|---|---|---|
| 7ecba4e0d5 | |||
| 6b8979a040 | |||
| bcf5ffcf40 | |||
| 5049a7bbf0 | |||
| e6e8679bfc | |||
| 6831e7e6fb | |||
| e3484939b6 | |||
| 2f9a4fac78 | |||
| e1f9ba090f | |||
| f6b4d89a3c | |||
| 8f25f6a6b6 |
@@ -60,6 +60,7 @@ Server* server_create(int port) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
server->file_descriptor = fd;
|
server->file_descriptor = fd;
|
||||||
|
server->ssl_ctx = NULL;
|
||||||
int opt = 1;
|
int opt = 1;
|
||||||
if (setsockopt(server->file_descriptor, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt))) {
|
if (setsockopt(server->file_descriptor, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt))) {
|
||||||
perror("Error setting a socket option!");
|
perror("Error setting a socket option!");
|
||||||
@@ -285,6 +286,7 @@ void client_disconnect(Client* client) {
|
|||||||
void client_delete(Client* client) {
|
void client_delete(Client* client) {
|
||||||
if (client == NULL)
|
if (client == NULL)
|
||||||
return;
|
return;
|
||||||
|
client_disconnect(client);
|
||||||
if (client->ssl_ctx) {
|
if (client->ssl_ctx) {
|
||||||
SSL_CTX_free(client->ssl_ctx);
|
SSL_CTX_free(client->ssl_ctx);
|
||||||
client->ssl_ctx = NULL;
|
client->ssl_ctx = NULL;
|
||||||
|
|||||||
@@ -224,8 +224,9 @@ static void test_sendfile_no_path() {
|
|||||||
pid_t pid = fork();
|
pid_t pid = fork();
|
||||||
if (pid == 0) {
|
if (pid == 0) {
|
||||||
close(p[1]);
|
close(p[1]);
|
||||||
/* When send_path is false, the sender sends raw data (size + bytes) only.
|
/* When send_path is false, the sender still sends file_type + data */
|
||||||
* We need to receive just the Data, not a File. */
|
int file_type;
|
||||||
|
receive_int(p[0], &file_type);
|
||||||
Data* received = receive_data(p[0]);
|
Data* received = receive_data(p[0]);
|
||||||
close(p[0]);
|
close(p[0]);
|
||||||
|
|
||||||
|
|||||||
@@ -8,8 +8,8 @@
|
|||||||
static void test_client_create_delete() {
|
static void test_client_create_delete() {
|
||||||
Client* client = client_create();
|
Client* client = client_create();
|
||||||
EXPECT_NOT_NULL(client);
|
EXPECT_NOT_NULL(client);
|
||||||
EXPECT_TRUE(client->file_descriptor >= 0);
|
EXPECT_EQ_INT(client->file_descriptor, -1);
|
||||||
EXPECT_EQ_INT(client->address.sin_family, AF_INET);
|
EXPECT_EQ_INT(client->address.ss_family, AF_UNSPEC);
|
||||||
EXPECT_EQ_INT(client->ssh_child_pid, -1);
|
EXPECT_EQ_INT(client->ssh_child_pid, -1);
|
||||||
EXPECT_NULL(client->ssl);
|
EXPECT_NULL(client->ssl);
|
||||||
EXPECT_NULL(client->ssl_ctx);
|
EXPECT_NULL(client->ssl_ctx);
|
||||||
@@ -30,7 +30,7 @@ static void test_server_create_delete() {
|
|||||||
Server* server = server_create(0);
|
Server* server = server_create(0);
|
||||||
EXPECT_NOT_NULL(server);
|
EXPECT_NOT_NULL(server);
|
||||||
EXPECT_TRUE(server->file_descriptor >= 0);
|
EXPECT_TRUE(server->file_descriptor >= 0);
|
||||||
EXPECT_EQ_INT(server->address.sin_family, AF_INET);
|
EXPECT_TRUE(server->address.ss_family == AF_INET || server->address.ss_family == AF_INET6);
|
||||||
EXPECT_NULL(server->ssl_ctx);
|
EXPECT_NULL(server->ssl_ctx);
|
||||||
|
|
||||||
/* Clean up */
|
/* Clean up */
|
||||||
@@ -57,9 +57,8 @@ static void test_client_create_multiple() {
|
|||||||
Client* c2 = client_create();
|
Client* c2 = client_create();
|
||||||
EXPECT_NOT_NULL(c1);
|
EXPECT_NOT_NULL(c1);
|
||||||
EXPECT_NOT_NULL(c2);
|
EXPECT_NOT_NULL(c2);
|
||||||
EXPECT_TRUE(c1->file_descriptor >= 0);
|
EXPECT_EQ_INT(c1->file_descriptor, -1);
|
||||||
EXPECT_TRUE(c2->file_descriptor >= 0);
|
EXPECT_EQ_INT(c2->file_descriptor, -1);
|
||||||
EXPECT_TRUE(c1->file_descriptor != c2->file_descriptor);
|
|
||||||
|
|
||||||
client_delete(c1);
|
client_delete(c1);
|
||||||
client_delete(c2);
|
client_delete(c2);
|
||||||
|
|||||||
Reference in New Issue
Block a user