matter/libmp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 1 Activity

update: add path section to MPTP packet

Browse Source
This commit is contained in:
ngn
2024-08-09 22:13:43 +03:00
parent f5d8514a27
commit 1404da3c6c
16 changed files with 382 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/mptp/client.c
View File

@ -28,15 +28,19 @@ int lm_mptp_client_connect(char *addr, uint16_t port) {
}
bool lm_mptp_client_verify(lm_mptp_t *packet) {
if (!lm_mptp_verify(packet))
if (!lm_mptp_verify(packet)){
pdebug(__func__, "failed to verify the packet: %s", lm_strerror());
return false;
}
if (MPTP_IS_REQUEST(packet)) {
pdebug(__func__, "MPTP packet is a request");
lm_error_set(LM_ERR_MPTPNotResponse);
return false;
}
if (packet->header.host_size != 0) {
pdebug(__func__, "MPTP response has host section");
lm_error_set(LM_ERR_MPTPBadHost);
return false;
}
@ -47,42 +51,59 @@ bool lm_mptp_client_verify(lm_mptp_t *packet) {
bool lm_mptp_client_send(int sock, lm_mptp_t *packet) {
if (NULL == packet) {
lm_error_set(LM_ERR_ArgNULL);
lm_mptp_free(packet);
return false;
}
if (MPTP_FLAGS_VERSION(packet) != MPTP_VERSION_SUPPORTED) {
lm_error_set(LM_ERR_MPTPBadVersion);
lm_mptp_free(packet);
return false;
}
if (packet->header.data_size > MPTP_DATA_MAX) {
lm_error_set(LM_ERR_MPTPBadData);
lm_mptp_free(packet);
return false;
}
if (packet->header.host_size > MPTP_HOST_MAX || packet->header.host_size <= 0) {
lm_error_set(LM_ERR_MPTPBadHost);
lm_mptp_free(packet);
return false;
}
char buffer[sizeof(packet->header) + packet->header.host_size + packet->header.data_size];
char buffer[
sizeof(packet->header) +
packet->header.host_size +
packet->header.path_size +
packet->header.data_size
];
ssize_t total = sizeof(buffer), used = 0, buflen = total;
packet->header.flags = htons(packet->header.flags);
bool ret = false;
copy_to_buffer(buffer, &packet->header, sizeof(packet->header), &total, &used);
copy_to_buffer(buffer, packet->host, packet->header.host_size, &total, &used);
copy_to_buffer(buffer, packet->path, packet->header.path_size, &total, &used);
copy_to_buffer(buffer, packet->data, packet->header.data_size, &total, &used);
packet->header.flags = htons(packet->header.flags);
//packet->header.host_size = htons(packet->header.host_size);
//packet->header.path_size = htons(packet->header.path_size);
packet->header.data_size = htons(packet->header.data_size);
if (send(sock, buffer, sizeof(buffer), MSG_MORE) < 0) {
lm_error_set(LM_ERR_MPTPSendFail);
return false;
goto end;
}
pdebug(__func__, "printing the packet dump (%lu bytes)", buflen);
pdebug_binary(buffer, buflen);
ret = true;
return true;
end:
lm_mptp_free(packet);
return ret;
}
bool lm_mptp_client_recv(int sock, lm_mptp_t *packet) {
@ -91,7 +112,7 @@ bool lm_mptp_client_recv(int sock, lm_mptp_t *packet) {
return false;
}
bzero(packet, sizeof(lm_mptp_t));
lm_mptp_free(packet);
if(!lm_mptp_recv(sock, packet)){
pdebug(__func__, "failed to receive the packet: %s", lm_strerror());

105
src/mptp/mptp.c
View File

@ -5,13 +5,17 @@
#include <errno.h>
#include <netinet/tcp.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
bool lm_mptp_init(lm_mptp_t *packet, bool is_request, uint8_t code, bool is_last) {
bzero(&packet->header, sizeof(packet->header));
bzero(packet->data, MPTP_DATA_MAX);
bzero(packet->host, MPTP_HOST_MAX);
void lm_mptp_init(lm_mptp_t *packet){
bzero(packet, sizeof(lm_mptp_t));
}
bool lm_mptp_new(lm_mptp_t *packet, bool is_request, uint8_t code, bool is_last) {
lm_mptp_init(packet);
if (code > MPTP_CODE_MAX) {
lm_error_set(LM_ERR_MPTPBadCode);
@ -35,6 +39,17 @@ bool lm_mptp_init(lm_mptp_t *packet, bool is_request, uint8_t code, bool is_last
return true;
}
void lm_mptp_free(lm_mptp_t *packet) {
if(NULL == packet)
return;
free(packet->host);
free(packet->path);
free(packet->data);
lm_mptp_init(packet);
}
bool lm_mptp_verify(lm_mptp_t *packet) {
if (NULL == packet) {
lm_error_set(LM_ERR_ArgNULL);
@ -46,6 +61,16 @@ bool lm_mptp_verify(lm_mptp_t *packet) {
return false;
}
if (packet->header.host_size > MPTP_HOST_MAX || packet->header.host_size < 0) {
lm_error_set(LM_ERR_MPTPBadHost);
return false;
}
if (packet->header.path_size > MPTP_PATH_MAX || packet->header.path_size < 0) {
lm_error_set(LM_ERR_MPTPBadPath);
return false;
}
if (packet->header.data_size > MPTP_DATA_MAX || packet->header.data_size < 0) {
lm_error_set(LM_ERR_MPTPBadData);
return false;
@ -161,9 +186,13 @@ bool lm_mptp_set_host(lm_mptp_t *packet, char *host) {
return false;
}
free(packet->host);
packet->host = malloc(size);
// do NOT copy the NULL terminator
packet->header.host_size = size;
memcpy(packet->host, host, size);
return true;
}
@ -179,14 +208,49 @@ bool lm_mptp_get_host(lm_mptp_t *packet, char *host) {
return true;
}
bool lm_mptp_set_path(lm_mptp_t *packet, char *path) {
size_t size = strlen(path);
if (size > MPTP_PATH_MAX || size < 0) {
lm_error_set(LM_ERR_MPTPBadHost);
return false;
}
free(packet->path);
packet->path = malloc(size);
// do NOT copy the NULL terminator
packet->header.path_size = size;
memcpy(packet->path, path, size);
return true;
}
bool lm_mptp_get_path(lm_mptp_t *packet, char *path) {
if (packet->header.path_size > MPTP_PATH_MAX || packet->header.path_size < 0) {
path = NULL;
lm_error_set(LM_ERR_BadHost);
return false;
}
memcpy(path, packet->path, packet->header.path_size);
path[packet->header.path_size] = 0;
return true;
}
bool lm_mptp_set_data(lm_mptp_t *packet, char *data, size_t size) {
if (size > MPTP_DATA_MAX || size < 0) {
lm_error_set(LM_ERR_MPTPBadData);
return false;
}
packet->header.data_size = size;
mempcpy(packet->data, data, size);
free(packet->data);
packet->data = malloc(size);
if(NULL != data){
packet->header.data_size = size;
mempcpy(packet->data, data, size);
}
return true;
}
@ -202,12 +266,6 @@ bool lm_mptp_get_data(lm_mptp_t *packet, char *data) {
return true;
}
void lm_mptp_copy(lm_mptp_t *dst, lm_mptp_t *src) {
memcpy(&dst->header, &src->header, sizeof(dst->header));
memcpy(&dst->host, &src->data, sizeof(src->host));
memcpy(&dst->data, &src->data, sizeof(src->data));
}
bool lm_mptp_recv(int sock, lm_mptp_t *packet) {
if (recv(sock, &packet->header, sizeof(packet->header), MSG_WAITALL) <= 0) {
if (ETIMEDOUT == errno || EAGAIN == errno) {
@ -217,12 +275,14 @@ bool lm_mptp_recv(int sock, lm_mptp_t *packet) {
lm_error_set(LM_ERR_MPTPRecvFail, strerror(errno));
return false;
}
packet->header.flags = ntohs(packet->header.flags);
// packet->header.host_size = ntohs(packet->header.host_size);
// packet->header.data_size = ntohs(packet->header.data_size);
/*packet->header.flags = ntohs(packet->header.flags);
packet->header.host_size = ntohs(packet->header.host_size);
packet->header.path_size = ntohs(packet->header.path_size);
packet->header.data_size = ntohs(packet->header.data_size);*/
if (packet->header.host_size <= MPTP_HOST_MAX && packet->header.host_size != 0){
packet->host = malloc(packet->header.host_size);
if(recv(sock, packet->host, packet->header.host_size, MSG_WAITALL) <= 0){
if (ETIMEDOUT == errno || EAGAIN == errno) {
lm_error_set(LM_ERR_MPTPTimeout);
@ -233,7 +293,20 @@ bool lm_mptp_recv(int sock, lm_mptp_t *packet) {
}
}
if (packet->header.path_size <= MPTP_PATH_MAX && packet->header.path_size != 0){
packet->path = malloc(packet->header.path_size);
if(recv(sock, packet->path, packet->header.path_size, MSG_WAITALL) <= 0){
if (ETIMEDOUT == errno || EAGAIN == errno) {
lm_error_set(LM_ERR_MPTPTimeout);
return false;
}
lm_error_set(LM_ERR_MPTPRecvFail, strerror(errno));
return false;
}
}
if (packet->header.data_size <= MPTP_DATA_MAX && packet->header.data_size != 0){
packet->data = malloc(packet->header.data_size);
if(recv(sock, packet->data, packet->header.data_size, MSG_WAITALL) <= 0){
if (ETIMEDOUT == errno || EAGAIN == errno) {
lm_error_set(LM_ERR_MPTPTimeout);

40
src/mptp/server.c
View File

@ -53,20 +53,19 @@ void lm_mptp_server_close(int sock){
}
bool lm_mptp_server_verify(lm_mptp_t *packet) {
if (!lm_mptp_verify(packet))
if (!lm_mptp_verify(packet)){
pdebug(__func__, "failed to verify the packet: %s", lm_strerror());
return false;
}
if (!MPTP_IS_REQUEST(packet)) {
pdebug(__func__, "MPTP packet is not request");
lm_error_set(LM_ERR_MPTPNotRequest);
return false;
}
if (packet->header.host_size > MPTP_HOST_MAX || packet->header.host_size <= 0) {
lm_error_set(LM_ERR_MPTPBadHost);
return false;
}
if (!MPTP_IS_LAST(packet)) {
pdebug(__func__, "MPTP packet is not the last");
lm_error_set(LM_ERR_MPTPNotLast);
return false;
}
@ -80,7 +79,7 @@ bool lm_mptp_server_recv(int sock, lm_mptp_t *packet) {
return false;
}
bzero(packet, sizeof(lm_mptp_t));
lm_mptp_free(packet);
if(!lm_mptp_recv(sock, packet)){
pdebug(__func__, "failed to receive the packet: %s", lm_strerror());
@ -93,40 +92,57 @@ bool lm_mptp_server_recv(int sock, lm_mptp_t *packet) {
bool lm_mptp_server_send(int sock, lm_mptp_t *packet) {
if (NULL == packet) {
lm_error_set(LM_ERR_ArgNULL);
lm_mptp_free(packet);
return false;
}
if (MPTP_FLAGS_VERSION(packet) != MPTP_VERSION_SUPPORTED) {
lm_error_set(LM_ERR_MPTPBadVersion);
lm_mptp_free(packet);
return false;
}
if (packet->header.data_size > MPTP_DATA_MAX) {
lm_error_set(LM_ERR_MPTPBadData);
lm_mptp_free(packet);
return false;
}
if (packet->header.host_size != 0) {
lm_error_set(LM_ERR_MPTPBadHost);
lm_mptp_free(packet);
return false;
}
char buffer[sizeof(packet->header) + packet->header.host_size + packet->header.data_size];
char buffer[
sizeof(packet->header) +
packet->header.host_size +
packet->header.path_size +
packet->header.data_size
];
ssize_t total = sizeof(buffer), used = 0, buflen = total;
packet->header.flags = htons(packet->header.flags);
bool ret = false;
copy_to_buffer(buffer, &packet->header, sizeof(packet->header), &total, &used);
copy_to_buffer(buffer, packet->host, packet->header.host_size, &total, &used);
copy_to_buffer(buffer, packet->path, packet->header.path_size, &total, &used);
copy_to_buffer(buffer, packet->data, packet->header.data_size, &total, &used);
packet->header.flags = htons(packet->header.flags);
//packet->header.host_size = htons(packet->header.host_size);
//packet->header.path_size = htons(packet->header.path_size);
packet->header.data_size = htons(packet->header.data_size);
if (send(sock, buffer, buflen, MSG_MORE) < 0) {
lm_error_set(LM_ERR_MPTPSendFail);
return false;
goto end;
}
pdebug(__func__, "printing the packet dump (%lu bytes)", buflen);
pdebug_binary(buffer, buflen);
ret = true;
return true;
end:
lm_mptp_free(packet);
return ret;
}

21
src/mptp/util.c
View File

@ -23,6 +23,8 @@ bool lm_mptp_sendfile(int sock, char *path, lm_mptp_transfer_callback_t callback
size_t read = 0;
struct stat st;
int size = -1;
lm_mptp_init(&packet);
if(NULL == file){
pdebug(__func__, "failed to open file: %s", path);
@ -38,7 +40,9 @@ bool lm_mptp_sendfile(int sock, char *path, lm_mptp_transfer_callback_t callback
total = st.st_size;
lm_mptp_init(&packet, false, MPTP_S2C_COOL, false);
lm_mptp_new(&packet, false, MPTP_S2C_COOL, false);
lm_mptp_set_data(&packet, NULL, digits(st.st_size));
if((size = snprintf(packet.data, MPTP_DATA_MAX, "%lu", st.st_size)) <= 0){
pdebug(__func__, "snprintf for stat size failed: %s", path);
lm_error_set(LM_ERR_SendSnprintfFail);
@ -52,7 +56,8 @@ bool lm_mptp_sendfile(int sock, char *path, lm_mptp_transfer_callback_t callback
goto end_1;
// clear the packet
lm_mptp_init(&packet, false, MPTP_S2C_COOL, false);
lm_mptp_new(&packet, false, MPTP_S2C_COOL, false);
lm_mptp_set_data(&packet, NULL, MPTP_DATA_MAX);
while ((read = fread(packet.data, 1, MPTP_DATA_MAX, file)) > 0) {
packet.header.data_size = read;
@ -68,7 +73,8 @@ bool lm_mptp_sendfile(int sock, char *path, lm_mptp_transfer_callback_t callback
if(NULL != callback && !callback(path, current, st.st_size, data))
goto end_1;
lm_mptp_init(&packet, false, MPTP_S2C_COOL, false);
lm_mptp_free(&packet);
lm_mptp_new(&packet, false, MPTP_S2C_COOL, false);
}
if(current != total){
@ -78,14 +84,16 @@ bool lm_mptp_sendfile(int sock, char *path, lm_mptp_transfer_callback_t callback
}
pdebug(__func__, "completed sending %s, sending last packet", path);
lm_mptp_init(&packet, false, MPTP_S2C_COOL, true);
lm_mptp_new(&packet, false, MPTP_S2C_COOL, true);
lm_mptp_server_send(sock, &packet);
ret = true;
goto end_2;
end_1:
lm_mptp_init(&packet, false, MPTP_S2C_BRUH, true);
lm_mptp_free(&packet);
lm_mptp_new(&packet, false, MPTP_S2C_BRUH, true);
lm_mptp_server_send(sock, &packet);
lm_mptp_free(&packet);
end_2:
if(NULL != file)
fclose(file);
@ -108,6 +116,8 @@ bool lm_mptp_recvfile(int sock, char *path, lm_mptp_transfer_callback_t callback
bool ret = false;
lm_mptp_t packet;
lm_mptp_init(&packet);
if(NULL == file){
pdebug(__func__, "failed to open file: %s", path);
lm_error_set(LM_ERR_RecvOpenFail);
@ -176,6 +186,7 @@ bool lm_mptp_recvfile(int sock, char *path, lm_mptp_transfer_callback_t callback
ret = true;
end:
lm_mptp_free(&packet);
if(NULL != file)
fclose(file);
return ret;