Fri, 13 May 2022 21:24:45 +0200
add missing HttpStream initializations
add some verbose logging to catch a bug
173
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | * |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
4 | * Copyright 2017 Olaf Wintermann. All rights reserved. |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | * |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | * |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | * |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | * |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | #include "srvctrlsocket.h" |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
31 | #include <stdio.h> |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
32 | #include <stdlib.h> |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
33 | #include <unistd.h> |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
34 | #include <string.h> |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
35 | #include <sys/socket.h> |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
36 | #include <sys/un.h> |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
37 | |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
38 | SrvConnection* srvctrl_connet(char *socketfile) { |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
39 | if(!socketfile) { |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
40 | fprintf(stderr, "srvctrl_connect: no socketfile\n"); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
41 | return NULL; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
42 | } |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
43 | size_t len = strlen(socketfile); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
44 | if(len == 0) { |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
45 | fprintf(stderr, "srvctrl_connect: invalid socket path\n"); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
46 | return NULL; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
47 | } |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
48 | if(len > 100) { |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
49 | fprintf(stderr, "srvctrl_connect: socket path too long\n"); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
50 | return NULL; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
51 | } |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
52 | |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
53 | int fd = socket(AF_UNIX, SOCK_STREAM, 0); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
54 | if(fd == -1) { |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
55 | perror("srvctrl_connect: cannot create socket"); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
56 | return NULL; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
57 | } |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
58 | |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
59 | struct sockaddr_un addr; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
60 | memset(&addr, 0, sizeof(addr)); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
61 | addr.sun_family = AF_UNIX; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
62 | memcpy(addr.sun_path, socketfile, len); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
63 | |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
64 | if(connect(fd, (struct sockaddr*)&addr, sizeof(addr))) { |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
65 | perror("srvctrl_connect"); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
66 | close(fd); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
67 | return NULL; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
68 | } |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
69 | |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
70 | FILE *stream = fdopen(fd, "r+"); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
71 | if(!stream) { |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
72 | close(fd); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
73 | return NULL; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
74 | } |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
75 | |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
76 | SrvConnection *conn = calloc(1, sizeof(SrvConnection)); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
77 | conn->socket = fd; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
78 | conn->stream = stream; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
79 | |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
80 | return conn; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
81 | } |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
82 | |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
83 | void srvctrl_close(SrvConnection *conn) { |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
84 | fclose(conn->stream); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
85 | free(conn); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
86 | } |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
87 | |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
88 | int srvctrl_readmsg(SrvConnection *conn, SrvMsg *msg) { |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
89 | int type = 0; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
90 | uint16_t length; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
91 | |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
92 | type = fgetc(conn->stream); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
93 | if(type == EOF) { |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
94 | return 1; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
95 | } |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
96 | |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
97 | if(fread(&length, 1, 2, conn->stream) != 2) { |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
98 | return -1; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
99 | } |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
100 | |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
101 | msg->type = type; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
102 | msg->length = length; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
103 | msg->message = malloc(length); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
104 | |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
105 | size_t r = fread(msg->message, 1, length, conn->stream); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
106 | if(r != length) { |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
107 | free(msg->message); |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
108 | return -1; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
109 | } |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
110 | |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
111 | return 0; |
63b8d52db390
adds new tool for webserver control
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
112 | } |