Skip to content

Test fix #132

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

Open
folkertvanheusden wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Test fix #132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
068e6c0
scpi_context.user_context is initialized to 0x00 by SCPI_Init
folkertvanheusden Nov 18, 2021
0184961
Evaluate rc of listen()
folkertvanheusden Nov 18, 2021
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
12 changes: 8 additions & 4 deletions examples/test-tcp/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
*
*/

#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down Expand Up @@ -140,7 +141,7 @@ static int createServer(int port) {
}

/* Listen on socket */
listen(fd, 1);
rc = listen(fd, 1);
if (rc < 0) {
perror("listen() failed");
close(fd);
Expand Down Expand Up @@ -179,9 +180,6 @@ int main(int argc, char** argv) {
int listenfd;
char smbuffer[10];

/* user_context will be pointer to socket */
scpi_context.user_context = NULL;

SCPI_Init(&scpi_context,
scpi_commands,
&scpi_interface,
Expand All @@ -190,13 +188,19 @@ int main(int argc, char** argv) {
scpi_input_buffer, SCPI_INPUT_BUFFER_LENGTH,
scpi_error_queue_data, SCPI_ERROR_QUEUE_SIZE);

signal(SIGPIPE, SIG_IGN);

listenfd = createServer(5025);

while (1) {
int clifd;
struct sockaddr_in cliaddr;
socklen_t clilen;

/* wait for a user to connect */
rc = waitServer(clifd);
if (rc < 0) continue;

clilen = sizeof (cliaddr);
clifd = accept(listenfd, (struct sockaddr *) &cliaddr, &clilen);

Expand Down