Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Update msc pcommands #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
viktorjo merged 10 commits into from
Mar 3, 2020
Merged

Update msc pcommands #225

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b1ea011
Added a missing command from Architecture document.
viktorjo Feb 20, 2020
2371be3
Added a no-parameter GetDirectoryContent.
viktorjo Feb 20, 2020
c13cac3
Merge branch 'dev' into update_MSCPcommands
LukasWikander Feb 21, 2020
e78326b
Begun the reconstruction of build directory content.
viktorjo Feb 21, 2020
c02e0bd
Begun integration of subdirectory fix
viktorjo Feb 22, 2020
333e54a
Made the building of files less general.
viktorjo Feb 23, 2020
145bf2f
Tested the getdirectory and it now works.
viktorjo Feb 23, 2020
0a19365
Added GetRootDirectoryContent command to the server.
viktorjo Feb 25, 2020
cd20643
Format to corrent indent.
viktorjo Mar 2, 2020
c4b0816
Merge branch 'dev' into update_MSCPcommands
viktorjo Mar 3, 2020
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
124 changes: 106 additions & 18 deletions server/src/systemcontrol.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mman.h>
#include <dirent.h>
#include <stdio.h>
#include <string.h>
Expand Down Expand Up @@ -51,6 +52,12 @@ typedef enum {
SERVER_STATE_ERROR,
} ServerState_t;

typedef struct {
int exist;
int fd;
char *info_buffer;
int size;
} content_dir_info;

#define SYSTEM_CONTROL_SERVICE_POLL_TIME_MS 5000
#define SYSTEM_CONTROL_TASK_PERIOD_MS 1
Expand Down Expand Up @@ -120,7 +127,7 @@ typedef enum {
Idle_0, GetServerStatus_0, ArmScenario_0, DisarmScenario_0, StartScenario_1, stop_0, AbortScenario_0,
InitializeScenario_0,
ConnectObject_0, DisconnectObject_0, GetServerParameterList_0, SetServerParameter_2, GetServerParameter_1,
DownloadFile_1, UploadFile_3, CheckFileDirectoryExist_1, GetDirectoryContent_1,
DownloadFile_1, UploadFile_3, CheckFileDirectoryExist_1, GetRootDirectoryContent_0, GetDirectoryContent_1,
DeleteFileDirectory_1, CreateDirectory_1, GetTestOrigin_0, replay_1, control_0, Exit_0, start_ext_trigg_1,
nocommand
} SystemControlCommand_t;
Expand All @@ -130,7 +137,7 @@ const char *SystemControlCommandsArr[] = {
"AbortScenario_0", "InitializeScenario_0",
"ConnectObject_0", "DisconnectObject_0", "GetServerParameterList_0", "SetServerParameter_2",
"GetServerParameter_1", "DownloadFile_1", "UploadFile_3", "CheckFileDirectoryExist_1",
"GetDirectoryContent_1",
"GetRootDirectoryContent_0", "GetDirectoryContent_1",
"DeleteFileDirectory_1", "CreateDirectory_1", "GetTestOrigin_0", "replay_1", "control_0", "Exit_0",
"start_ext_trigg_1"
};
Expand All @@ -148,6 +155,8 @@ char SystemControlArgument[SYSTEM_CONTROL_ARG_MAX_COUNT][SYSTEM_CONTROL_ARGUMENT
C8 *STR_SYSTEM_CONTROL_RX_PACKET_SIZE = "1280";
C8 *STR_SYSTEM_CONTROL_TX_PACKET_SIZE = "1200";

content_dir_info SystemControlDirectoryInfo = { 0, 0, NULL, 0 };

/*------------------------------------------------------------
-- Function declarations.
------------------------------------------------------------*/
Expand Down Expand Up @@ -177,7 +186,8 @@ I32 SystemControlUploadFile(C8 * Path, C8 * FileSize, C8 * PacketSize, C8 * Retu
I32 SystemControlReceiveRxData(I32 * sockfd, C8 * Path, C8 * FileSize, C8 * PacketSize, C8 * ReturnValue,
U8 Debug);
I32 SystemControlDeleteFileDirectory(C8 * Path, C8 * ReturnValue, U8 Debug);
I32 SystemControlBuildFileContentInfo(C8 * Path, C8 * ReturnValue, U8 Debug);
I32 SystemControlBuildFileContentInfo(C8 * Path, U8 Debug);
I32 SystemControlDestroyFileContentInfo(C8 * path);
I32 SystemControlSendFileContent(I32 * sockfd, C8 * Path, C8 * PacketSize, C8 * ReturnValue, U8 Remove,
U8 Debug);
I32 SystemControlCreateDirectory(C8 * Path, C8 * ReturnValue, U8 Debug);
Expand Down Expand Up @@ -706,6 +716,8 @@ void systemcontrol_task(TimeType * GPSTime, GSDType * GSD, LOG_LEVEL logLevel) {
SystemControlCommand = Idle_0;
}
break;
case GetRootDirectoryContent_0:
LogMessage(LOG_LEVEL_ERROR, "GetRootDirectory called");
case GetDirectoryContent_1:
if (CurrentInputArgCount == CommandArgCount) {
SystemControlCommand = Idle_0;
Expand All @@ -716,16 +728,36 @@ void systemcontrol_task(TimeType * GPSTime, GSDType * GSD, LOG_LEVEL logLevel) {
if (ControlResponseBuffer[0] == FOLDER_EXIST) {
UtilCreateDirContent(SystemControlArgument[0], "dir.info");
bzero(ControlResponseBuffer, SYSTEM_CONTROL_CONTROL_RESPONSE_SIZE);
SystemControlBuildFileContentInfo("dir.info", ControlResponseBuffer, 0);
SystemControlSendControlResponse(SYSTEM_CONTROL_RESPONSE_CODE_OK, "GetDirectoryContent:",
ControlResponseBuffer, 4, &ClientSocket, 0);
SystemControlSendFileContent(&ClientSocket, "dir.info", STR_SYSTEM_CONTROL_TX_PACKET_SIZE,
ControlResponseBuffer, REMOVE_FILE, 0);

I32 file_len = SystemControlBuildFileContentInfo("dir.info", 0);

/*
if (file_len > 0) printf("file contred Created\n");
char *traversingPointer = SystemControlDirectoryInfo.info_buffer;
for (int i = 0; i < file_len; i++) {
printf("0x%X\n", *traversingPointer);
traversingPointer++;
}
*/
SystemControlSendControlResponse(SYSTEM_CONTROL_RESPONSE_CODE_OK,
"SubGetDirectoryContent:",
SystemControlDirectoryInfo.info_buffer, file_len,
&ClientSocket, 0);

SystemControlDestroyFileContentInfo("dir.info");
/*
SystemControlBuildFileContentInfo("dir.info", ControlResponseBuffer, 0);

SystemControlSendFileContent(&ClientSocket, "dir.info", STR_SYSTEM_CONTROL_TX_PACKET_SIZE,
ControlResponseBuffer, REMOVE_FILE, 0);
*/
}

}
else {
LogMessage(LOG_LEVEL_ERROR, "Wrong parameter count in GetDirectoryContent(path)!");
LogMessage(LOG_LEVEL_ERROR,
"Wrong parameter count in GetDirectoryContent(path)! got:%d, expected:%d",
CurrentInputArgCount, CommandArgCount);
SystemControlCommand = Idle_0;
}
break;
Expand All @@ -739,7 +771,7 @@ void systemcontrol_task(TimeType * GPSTime, GSDType * GSD, LOG_LEVEL logLevel) {
if (ControlResponseBuffer[0] == FILE_EXIST) {
UtilCreateDirContent(SystemControlArgument[0], SystemControlArgument[0]);
bzero(ControlResponseBuffer, SYSTEM_CONTROL_CONTROL_RESPONSE_SIZE);
SystemControlBuildFileContentInfo(SystemControlArgument[0], ControlResponseBuffer, 0);
SystemControlBuildFileContentInfo(SystemControlArgument[0], 0);
SystemControlSendControlResponse(SYSTEM_CONTROL_RESPONSE_CODE_OK, "SubDownloadFile:",
ControlResponseBuffer, 4, &ClientSocket, 0);
SystemControlSendFileContent(&ClientSocket, SystemControlArgument[0],
Expand Down Expand Up @@ -783,7 +815,7 @@ void systemcontrol_task(TimeType * GPSTime, GSDType * GSD, LOG_LEVEL logLevel) {
ControlResponseBuffer, 0);
}

SystemControlSendControlResponse(SYSTEM_CONTROL_RESPONSE_CODE_OK, "UploadFile:",
SystemControlSendControlResponse(SYSTEM_CONTROL_RESPONSE_CODE_OK, "SubUploadFile:",
ControlResponseBuffer, 1, &ClientSocket, 0);

}
Expand Down Expand Up @@ -1910,25 +1942,81 @@ I32 SystemControlReadServerParameterList(C8 * ParameterList, U8 Debug) {
return strlen(ParameterList);
}

I32 SystemControlBuildFileContentInfo(C8 * Path, C8 * ReturnValue, U8 Debug) {
I32 SystemControlBuildFileContentInfo(C8 * Path, U8 Debug) {

/*
struct stat st;
C8 CompletePath[MAX_FILE_PATH];

bzero(CompletePath, MAX_FILE_PATH);
UtilGetTestDirectoryPath(CompletePath, sizeof (CompletePath));
strcat(CompletePath, Path);

stat(CompletePath, &st);
*(ReturnValue + 0) = (U8) (st.st_size >> 24);
*(ReturnValue + 1) = (U8) (st.st_size >> 16);
*(ReturnValue + 2) = (U8) (st.st_size >> 8);
*(ReturnValue + 3) = (U8) st.st_size;


if (Debug)
LogMessage(LOG_LEVEL_DEBUG, "Filesize %d of %s", (I32) st.st_size, CompletePath);

return st.st_size;
*/
struct stat st;
C8 CompletePath[MAX_FILE_PATH];
C8 temporaryCompletePath[MAX_FILE_PATH];

bzero(CompletePath, MAX_FILE_PATH);

if (SystemControlDirectoryInfo.exist)
return -1;

UtilGetTestDirectoryPath(CompletePath, sizeof (CompletePath));
strcat(CompletePath, Path);
stat(CompletePath, &st);
// Create new temporary file, containing the length of the current file in hex + the rest of the document
strcat(temporaryCompletePath, ".temp");
FILE *comp_fd = fopen(CompletePath, "r");
FILE *temp_fd = fopen(temporaryCompletePath, "w");

fprintf(temp_fd, "%c%c%c%c",
(U8) (st.st_size >> 24), (U8) (st.st_size >> 16), (U8) (st.st_size >> 8), (U8) (st.st_size)
);

while (!feof(comp_fd)) {
fputc(fgetc(comp_fd), temp_fd);
}

fclose(comp_fd);
fclose(temp_fd);

// Rename the temporary file to the name of the previous one
rename(temporaryCompletePath, CompletePath);
stat(CompletePath, &st);
*(ReturnValue + 0) = (U8) (st.st_size >> 24);
*(ReturnValue + 1) = (U8) (st.st_size >> 16);
*(ReturnValue + 2) = (U8) (st.st_size >> 8);
*(ReturnValue + 3) = (U8) st.st_size;
// Create mmap of the file and return the length
SystemControlDirectoryInfo.fd = open(CompletePath, O_RDWR);
SystemControlDirectoryInfo.info_buffer =
mmap(NULL, st.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, SystemControlDirectoryInfo.fd, 0);
SystemControlDirectoryInfo.size = st.st_size;
SystemControlDirectoryInfo.exist = 1;
return st.st_size;
}

I32 SystemControlDestroyFileContentInfo(C8 * path) {
char CompletePath[MAX_FILE_PATH];
struct stat st;

if (Debug)
LogMessage(LOG_LEVEL_DEBUG, "Filesize %d of %s", (I32) st.st_size, CompletePath);
if (!SystemControlDirectoryInfo.exist)
return -1;
UtilGetTestDirectoryPath(CompletePath, sizeof (CompletePath));
strcat(CompletePath, path);

munmap(SystemControlDirectoryInfo.info_buffer, SystemControlDirectoryInfo.size);
close(SystemControlDirectoryInfo.fd);
SystemControlDirectoryInfo.exist = 0;
//remove(CompletePath);
return 0;
}

Expand Down