ChronosXYZ/netsukuku
1
0
Fork 0
mirror of https://github.com/ChronosX88/netsukuku.git synced 2024-11-22 02:02:20 +00:00
Code Issues Projects Releases Wiki Activity

ntk-console: Fix retransmit on console

Browse Source
This commit is contained in:
Alexander von Gluck IV 2014-09-14 15:56:36 -05:00
parent eb12395dcb
commit 98e77ded15
2 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/ntk-console.c
View File

@ -53,7 +53,7 @@ const struct supported_commands {
command_t
command_parse(char *request)
command_parse(char* request)
{
if (strlen(request) > CONSOLE_BUFFER_LENGTH) {
printf("Error: Command longer than 250 bytes.\n");
@ -98,42 +98,13 @@ request_receive(int sock, char message[], int max)
}
/* Sends and receives to ntkd */
void
ntkd_request(command_t command)
{
if (sockfd <= 0) {
perror("ntkd connection closed unexpectedly!\n");
exit(-1);
}
cmd_packet_t packetOut;
packetOut.command = command;
rc = send(sockfd, &packetOut, sizeof(packetOut), 0);
if (rc < sizeof(packetOut)) {
perror("send() failed");
exit(-1);
}
char response[CONSOLE_BUFFER_LENGTH];
request_receive(sockfd, response, CONSOLE_BUFFER_LENGTH);
if (rc < 0) {
perror("recv() failed");
exit(-1);
}
printf("Response: %s\n", response);
}
void
int
opensocket(void)
{
sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
if (sockfd < 0) {
perror("socket creation failed");
exit(-1);
return -1;
}
memset(&serveraddr, 0, sizeof(serveraddr));
@ -143,10 +114,9 @@ opensocket(void)
rc = connect(sockfd, (struct sockaddr *)&serveraddr, sizeof(serveraddr));
if (rc < 0) {
perror("connect() failed");
printf("Unable to connect to ntk daemon console.\n");
exit(-1);
return -1;
}
printf("ntkd console connection opened successfully.\n");
return 0;
}
@ -160,8 +130,37 @@ closesocket(void)
if (sockfd >= 0)
close(sockfd);
}
printf("ntkd console connection closed.\n");
/* Sends and receives to ntkd */
void
ntkd_request(command_t command)
{
if (opensocket() < 0) {
printf("Unable to connect to ntk daemon console.\n");
return;
}
cmd_packet_t packetOut;
packetOut.command = command;
rc = send(sockfd, &packetOut, sizeof(packetOut), 0);
if (rc < sizeof(packetOut)) {
perror("send() failed");
exit(-1);
}
char* response = (char*)malloc(CONSOLE_BUFFER_LENGTH);
request_receive(sockfd, response, CONSOLE_BUFFER_LENGTH);
if (rc < 0) {
perror("recv() failed");
exit(-1);
}
printf("Response: '%s'\n", response);
free(response);
closesocket();
}
@ -263,8 +262,6 @@ main(void)
uptime_month = timeinfo->tm_mon;
uptime_year = timeinfo->tm_year;
opensocket();
printf("This is the Netsukuku Console. Please type 'help' for more information.\n");
for(;;) {
char* request = (char*)malloc(CONSOLE_BUFFER_LENGTH);
@ -273,13 +270,15 @@ main(void)
fflush(stdin);
console(request);
free(request);
}
closesocket();
}
return 0;
}
void usage(void) {
void
usage(void)
{
printf("Usage:\n");
for (int i = 0; i < sizeof(kSupportedCommands)
/ sizeof(kSupportedCommands[0]); i++) {

2
src/ntk-console.h
View File

@ -43,7 +43,7 @@ int i;
void usage();
void clean_up();
void opensocket();
int opensocket();
void closesocket();