To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to plugbasedclient.c
- browse files at revision 31
- compare with another revision
- download diff
- download tarball
- view history from revision 31
- Committer: Teddy Hogeborn
- Date: 2008-08-01 06:33:15 UTC
- Revision ID: teddy@fukt.bsnet.se-20080801063315-4k33q3ek28hjc3tu
* plugins.d/plugbasedclient.c: Update include file comments.
(struct process.disable): Renamed to "disabled". All users changed.
(addarguments): Renamed to "addargument". All callers changed.
(doc, args_doc): Removed.
(main): Changed default "plugindir" to
"/conf/conf.d/mandos/plugins.d". Renamed "rfds_orig" to
"rfds_all"; all users changed. New "debug" and
"exitstatus" variables. New "--debug" option. Removed
unnecessary ".flags = 0" from all options. Changed so that
"--disable-plugin" only takes one plugin. Check for
non-existence of ":" in argument to "--options-for". Added
some debugging outputs. Set the FD_CLOEXEC flag on the
directory FD. More capable code for dealing with
disallowed plugin file name prefixes and suffixes. Bug
fix: check for some malloc failures. Moved allocating the
"struct process *new_process" to after the fork. Do
_exit() instead of exit() in the child.
* plugins.d/mandosclient.c: Updated contact information.
(struct process.disable): Renamed to "disabled". All users changed.
(addarguments): Renamed to "addargument". All callers changed.
(doc, args_doc): Removed.
(main): Changed default "plugindir" to
"/conf/conf.d/mandos/plugins.d". Renamed "rfds_orig" to
"rfds_all"; all users changed. New "debug" and
"exitstatus" variables. New "--debug" option. Removed
unnecessary ".flags = 0" from all options. Changed so that
"--disable-plugin" only takes one plugin. Check for
non-existence of ":" in argument to "--options-for". Added
some debugging outputs. Set the FD_CLOEXEC flag on the
directory FD. More capable code for dealing with
disallowed plugin file name prefixes and suffixes. Bug
fix: check for some malloc failures. Moved allocating the
"struct process *new_process" to after the fork. Do
_exit() instead of exit() in the child.
* plugins.d/mandosclient.c: Updated contact information.
- files added:
- ca.pem
- files removed:
- mandos-client.xml
- files renamed:
- mandos-client.c => plugbasedclient.c
- plugins.d/password-request.c => plugins.d/mandosclient.c
- plugins.d/password-prompt.c => plugins.d/passprompt.c
- mandos.conf => server.conf
- mandos => server.py
- files modified:
- Makefile
added
removed
plugbasedclient.c
21
21
* Contact the authors at <mandos@fukt.bsnet.se>.
22
22
*/
23
23
24
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY() */
25
26
24
#include <stdio.h> /* popen(), fileno(), fprintf(),
27
25
stderr, STDOUT_FILENO */
28
26
#include <iso646.h> /* and, or, not */
29
#include <sys/types.h> /* DIR, opendir(), stat(),
30
struct stat, waitpid(),
31
WIFEXITED(), WEXITSTATUS(),
32
wait() */
27
#include <sys/types.h> /* DIR, opendir(), stat(), struct stat,
28
waitpid(), WIFEXITED(),
29
WEXITSTATUS(), wait() */
33
30
#include <sys/wait.h> /* wait() */
34
31
#include <dirent.h> /* DIR, struct dirent, opendir(),
35
32
readdir(), closedir() */
50
47
struct argp_state, struct argp,
51
48
argp_parse() */
52
49
53
#define BUFFER_SIZE 256
54
55
50
struct process;
56
51
57
52
typedef struct process{
60
55
char *buffer;
61
56
size_t buffer_size;
62
57
size_t buffer_length;
63
bool eof;
64
bool completed;
65
int status;
66
58
struct process *next;
67
59
} process;
68
60
74
66
struct plugin *next;
75
67
} plugin;
76
68
77
static plugin *getplugin(char *name, plugin **plugin_list){
69
plugin *getplugin(char *name, plugin **plugin_list){
78
70
for (plugin *p = *plugin_list; p != NULL; p = p->next){
79
71
if ((p->name == name)
80
72
or (p->name and name and (strcmp(p->name, name) == 0))){
103
95
return new_plugin;
104
96
}
105
97
106
static void addargument(plugin *p, char *arg){
98
void addargument(plugin *p, char *arg){
107
99
p->argv[p->argc] = arg;
108
100
p->argv = realloc(p->argv, sizeof(char *) * (size_t)(p->argc + 2));
109
101
if (p->argv == NULL){
114
106
p->argv[p->argc] = NULL;
115
107
}
116
108
117
/*
118
* Based on the example in the GNU LibC manual chapter 13.13 "File
119
* Descriptor Flags".
120
* *Note File Descriptor Flags:(libc)Descriptor Flags.
121
*/
122
static int set_cloexec_flag(int fd)
123
{
124
int ret = fcntl(fd, F_GETFD, 0);
125
/* If reading the flags failed, return error indication now. */
126
if(ret < 0){
127
return ret;
128
}
129
/* Store modified flag word in the descriptor. */
130
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
131
}
132
133
const char *argp_program_version = "plugbasedclient 0.9";
134
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
135
136
process *process_list = NULL;
137
138
/* Mark a process as completed when it exits, and save its exit
139
status. */
140
void handle_sigchld(__attribute__((unused)) int sig){
141
process *proc = process_list;
142
int status;
143
pid_t pid = wait(&status);
144
while(proc != NULL and proc->pid != pid){
145
proc = proc->next;
146
}
147
if(proc == NULL){
148
/* Process not found in process list */
149
return;
150
}
151
proc->status = status;
152
proc->completed = true;
153
}
109
#define BUFFER_SIZE 256
110
111
const char *argp_program_version =
112
"plugbasedclient 0.9";
113
const char *argp_program_bug_address =
114
"<mandos@fukt.bsnet.se>";
154
115
155
116
int main(int argc, char *argv[]){
156
117
const char *plugindir = "/conf/conf.d/mandos/plugins.d";
157
118
size_t d_name_len;
158
DIR *dir = NULL;
119
DIR *dir;
159
120
struct dirent *dirst;
160
121
struct stat st;
161
122
fd_set rfds_all;
162
123
int ret, maxfd = 0;
163
uid_t uid = 65534;
164
gid_t gid = 65534;
124
process *process_list = NULL;
165
125
bool debug = false;
166
126
int exitstatus = EXIT_SUCCESS;
167
struct sigaction old_sigchld_action;
168
struct sigaction sigchld_action = { .sa_handler = handle_sigchld,
169
.sa_flags = SA_NOCLDSTOP };
170
char *plus_options = NULL;
171
char **plus_argv = NULL;
172
173
/* Establish a signal handler */
174
sigemptyset(&sigchld_action.sa_mask);
175
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
176
if(ret < 0){
177
perror("sigaddset");
178
exit(EXIT_FAILURE);
179
}
180
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
181
if(ret < 0){
182
perror("sigaction");
183
exit(EXIT_FAILURE);
184
}
185
127
186
128
/* The options we understand. */
187
129
struct argp_option options[] = {
197
139
{ .name = "plugin-dir", .key = 128,
198
140
.arg = "DIRECTORY",
199
141
.doc = "Specify a different plugin directory", .group = 2 },
200
{ .name = "userid", .key = 129,
201
.arg = "ID", .flags = 0,
202
.doc = "User ID the plugins will run as", .group = 2 },
203
{ .name = "groupid", .key = 130,
204
.arg = "ID", .flags = 0,
205
.doc = "Group ID the plugins will run as", .group = 2 },
206
{ .name = "debug", .key = 131,
142
{ .name = "debug", .key = 129,
207
143
.doc = "Debug mode", .group = 3 },
208
144
{ .name = NULL }
209
145
};
210
146
211
147
error_t parse_opt (int key, char *arg, struct argp_state *state) {
212
/* Get the INPUT argument from `argp_parse', which we know is a
213
pointer to our plugin list pointer. */
148
/* Get the INPUT argument from `argp_parse', which we
149
know is a pointer to our plugin list pointer. */
214
150
plugin **plugins = state->input;
215
151
switch (key) {
216
152
case 'g':
219
155
do{
220
156
addargument(getplugin(NULL, plugins), p);
221
157
p = strtok(NULL, ",");
222
} while (p != NULL);
158
} while (p);
223
159
}
224
160
break;
225
161
case 'o':
226
162
if (arg != NULL){
227
163
char *name = strtok(arg, ":");
228
164
char *p = strtok(NULL, ":");
229
if(p != NULL){
165
if(p){
230
166
p = strtok(p, ",");
231
167
do{
232
168
addargument(getplugin(name, plugins), p);
233
169
p = strtok(NULL, ",");
234
} while (p != NULL);
170
} while (p);
235
171
}
236
172
}
237
173
break;
244
180
plugindir = arg;
245
181
break;
246
182
case 129:
247
uid = (uid_t)strtol(arg, NULL, 10);
248
break;
249
case 130:
250
gid = (gid_t)strtol(arg, NULL, 10);
251
break;
252
case 131:
253
183
debug = true;
254
184
break;
255
185
case ARGP_KEY_ARG:
256
if(plus_options != NULL or arg == NULL or arg[0] != '+'){
257
argp_usage (state);
258
}
259
plus_options = arg;
186
argp_usage (state);
260
187
break;
261
188
case ARGP_KEY_END:
262
189
break;
269
196
plugin *plugin_list = NULL;
270
197
271
198
struct argp argp = { .options = options, .parser = parse_opt,
272
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
199
.args_doc = "",
273
200
.doc = "Mandos plugin runner -- Run plugins" };
274
201
275
argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
276
277
if(plus_options){
278
/* This is a mangled argument in the form of
279
"+--option+--other-option=parameter+--yet-another-option", etc */
280
/* Make new argc and argv vars, and call argp_parse() again. */
281
plus_options++; /* skip the first '+' character */
282
const char delims[] = "+";
283
char *arg;
284
int new_argc = 1;
285
plus_argv = malloc(sizeof(char*) * 2);
286
if(plus_argv == NULL){
287
perror("malloc");
288
exitstatus = EXIT_FAILURE;
289
goto end;
290
}
291
plus_argv[0] = argv[0];
292
plus_argv[1] = NULL;
293
arg = strtok(plus_options, delims); /* Get first argument */
294
while(arg != NULL){
295
new_argc++;
296
plus_argv = realloc(plus_argv, sizeof(char *)
297
* ((unsigned int) new_argc + 1));
298
if(plus_argv == NULL){
299
perror("malloc");
300
exitstatus = EXIT_FAILURE;
301
goto end;
302
}
303
plus_argv[new_argc-1] = arg;
304
plus_argv[new_argc] = NULL;
305
arg = strtok(NULL, delims); /* Get next argument */
306
}
307
argp_parse (&argp, new_argc, plus_argv, 0, 0, &plugin_list);
308
}
202
argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
309
203
310
204
if(debug){
311
205
for(plugin *p = plugin_list; p != NULL; p=p->next){
312
206
fprintf(stderr, "Plugin: %s has %d arguments\n",
313
p->name ? p->name : "Global", p->argc - 1);
207
p->name ? p->name : "Global", p->argc);
314
208
for(char **a = p->argv; *a != NULL; a++){
315
209
fprintf(stderr, "\tArg: %s\n", *a);
316
210
}
317
211
}
318
212
}
319
213
320
ret = setuid(uid);
321
if (ret == -1){
322
perror("setuid");
323
}
324
325
setgid(gid);
326
if (ret == -1){
327
perror("setgid");
328
}
329
330
214
dir = opendir(plugindir);
215
{
216
/* Set the FD_CLOEXEC flag on the directory */
217
int fd = dirfd(dir);
218
ret = fcntl (fd, F_GETFD, 0);
219
if(ret < 0){
220
perror("fcntl F_GETFD");
221
goto end;
222
}
223
ret = fcntl(fd, F_SETFD, FD_CLOEXEC | ret);
224
if(ret < 0){
225
perror("fcntl F_SETFD");
226
goto end;
227
}
228
}
229
331
230
if(dir == NULL){
332
perror("Could not open plugin dir");
333
exitstatus = EXIT_FAILURE;
334
goto end;
335
}
336
337
/* Set the FD_CLOEXEC flag on the directory, if possible */
338
{
339
int dir_fd = dirfd(dir);
340
if(dir_fd >= 0){
341
ret = set_cloexec_flag(dir_fd);
342
if(ret < 0){
343
perror("set_cloexec_flag");
344
exitstatus = EXIT_FAILURE;
345
goto end;
346
}
347
}
231
fprintf(stderr, "Can not open directory\n");
232
return EXIT_FAILURE;
348
233
}
349
234
350
235
FD_ZERO(&rfds_all);
373
258
if((d_name_len >= pre_len)
374
259
and strncmp((dirst->d_name), *pre, pre_len) == 0){
375
260
if(debug){
376
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
261
fprintf(stderr, "Ignoring plugin dir entry name \"%s\""
377
262
" with bad prefix %s\n", dirst->d_name, *pre);
378
263
}
379
264
bad_name = true;
391
276
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
392
277
== 0)){
393
278
if(debug){
394
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
279
fprintf(stderr, "Ignoring plugin dir entry name \"%s\""
395
280
" with bad suffix %s\n", dirst->d_name, *suf);
396
281
}
397
282
bad_name = true;
407
292
char *filename = malloc(d_name_len + strlen(plugindir) + 2);
408
293
if (filename == NULL){
409
294
perror("malloc");
410
exitstatus = EXIT_FAILURE;
295
exitstatus =EXIT_FAILURE;
411
296
goto end;
412
297
}
413
strcpy(filename, plugindir); /* Spurious warning */
414
strcat(filename, "/"); /* Spurious warning */
415
strcat(filename, dirst->d_name); /* Spurious warning */
416
298
strcpy(filename, plugindir);
299
strcat(filename, "/");
300
strcat(filename, dirst->d_name);
301
417
302
stat(filename, &st);
418
303
419
304
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
420
305
if(debug){
421
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
306
fprintf(stderr, "Ignoring plugin dir entry name \"%s\""
422
307
" with bad type or mode\n", filename);
423
308
}
424
free(filename);
425
309
continue;
426
310
}
427
311
if(getplugin(dirst->d_name, &plugin_list)->disabled){
428
312
if(debug){
429
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
313
fprintf(stderr, "Ignoring disabled plugin \"%s\"",
430
314
dirst->d_name);
431
315
}
432
free(filename);
433
316
continue;
434
317
}
435
plugin *p = getplugin(dirst->d_name, &plugin_list);
436
{
437
/* Add global arguments to argument list for this plugin */
438
plugin *g = getplugin(NULL, &plugin_list);
439
for(char **a = g->argv + 1; *a != NULL; a++){
440
addargument(p, *a);
441
}
442
}
318
// Starting a new process to be watched
443
319
int pipefd[2];
444
320
ret = pipe(pipefd);
445
321
if (ret == -1){
446
perror("pipe");
447
exitstatus = EXIT_FAILURE;
448
goto end;
449
}
450
ret = set_cloexec_flag(pipefd[0]);
451
if(ret < 0){
452
perror("set_cloexec_flag");
453
exitstatus = EXIT_FAILURE;
454
goto end;
455
}
456
ret = set_cloexec_flag(pipefd[1]);
457
if(ret < 0){
458
perror("set_cloexec_flag");
459
exitstatus = EXIT_FAILURE;
460
goto end;
461
}
462
/* Block SIGCHLD until process is safely in process list */
463
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
464
if(ret < 0){
465
perror("sigprocmask");
466
exitstatus = EXIT_FAILURE;
467
goto end;
468
}
469
// Starting a new process to be watched
322
perror(argv[0]);
323
goto end;
324
}
470
325
pid_t pid = fork();
471
326
if(pid == 0){
472
327
/* this is the child process */
473
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
474
if(ret < 0){
475
perror("sigaction");
476
_exit(EXIT_FAILURE);
477
}
478
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
479
if(ret < 0){
480
perror("sigprocmask");
481
_exit(EXIT_FAILURE);
482
}
328
closedir(dir);
329
close(pipefd[0]); /* close unused read end of pipe */
483
330
dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
484
331
485
if(dirfd(dir) < 0){
486
/* If dir has no file descriptor, we could not set FD_CLOEXEC
487
above and must now close it manually here. */
488
closedir(dir);
332
plugin *p = getplugin(dirst->d_name, &plugin_list);
333
plugin *g = getplugin(NULL, &plugin_list);
334
for(char **a = g->argv + 1; *a != NULL; a++){
335
addargument(p, *a);
489
336
}
490
337
if(execv(filename, p->argv) < 0){
491
perror("execv");
338
perror(argv[0]);
339
close(pipefd[1]);
492
340
_exit(EXIT_FAILURE);
493
341
}
494
342
/* no return */
495
343
}
496
/* parent process */
497
free(filename);
498
344
close(pipefd[1]); /* close unused write end of pipe */
499
345
process *new_process = malloc(sizeof(process));
500
346
if (new_process == NULL){
501
347
perror("malloc");
502
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
503
if(ret < 0){
504
perror("sigprocmask");
505
}
506
exitstatus = EXIT_FAILURE;
507
goto end;
508
}
509
510
*new_process = (struct process){ .pid = pid,
511
.fd = pipefd[0],
512
.next = process_list };
513
// List handling
514
process_list = new_process;
515
/* Unblock SIGCHLD so signal handler can be run if this process
516
has already completed */
517
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
518
if(ret < 0){
519
perror("sigprocmask");
520
exitstatus = EXIT_FAILURE;
521
goto end;
522
}
523
348
exitstatus = EXIT_FAILURE;
349
goto end;
350
}
351
352
new_process->fd = pipefd[0];
353
new_process->buffer = malloc(BUFFER_SIZE);
354
if (new_process->buffer == NULL){
355
perror("malloc");
356
exitstatus = EXIT_FAILURE;
357
goto end;
358
}
359
new_process->buffer_size = BUFFER_SIZE;
360
new_process->buffer_length = 0;
524
361
FD_SET(new_process->fd, &rfds_all);
525
362
526
363
if (maxfd < new_process->fd){
527
364
maxfd = new_process->fd;
528
365
}
529
366
530
}
531
532
/* Free the plugin list */
533
for(plugin *next; plugin_list != NULL; plugin_list = next){
534
next = plugin_list->next;
535
free(plugin_list->argv);
536
free(plugin_list);
367
//List handling
368
new_process->next = process_list;
369
process_list = new_process;
537
370
}
538
371
539
372
closedir(dir);
540
dir = NULL;
541
373
542
if (process_list == NULL){
543
fprintf(stderr, "No plugin processes started, exiting\n");
544
exitstatus = EXIT_FAILURE;
545
goto end;
546
}
547
while(process_list){
548
fd_set rfds = rfds_all;
549
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
550
if (select_ret == -1){
551
perror("select");
552
exitstatus = EXIT_FAILURE;
553
goto end;
554
}
555
/* OK, now either a process completed, or something can be read
556
from one of them */
557
for(process *proc = process_list; proc ; proc = proc->next){
558
/* Is this process completely done? */
559
if(proc->eof and proc->completed){
560
/* Only accept the plugin output if it exited cleanly */
561
if(not WIFEXITED(proc->status)
562
or WEXITSTATUS(proc->status) != 0){
563
/* Bad exit by plugin */
564
if(debug){
565
if(WIFEXITED(proc->status)){
566
fprintf(stderr, "Plugin %d exited with status %d\n",
567
proc->pid, WEXITSTATUS(proc->status));
568
} else if(WIFSIGNALED(proc->status)) {
569
fprintf(stderr, "Plugin %d killed by signal %d\n",
570
proc->pid, WTERMSIG(proc->status));
571
} else if(WCOREDUMP(proc->status)){
572
fprintf(stderr, "Plugin %d dumped core\n", proc->pid);
573
}
574
}
575
/* Remove the plugin */
576
FD_CLR(proc->fd, &rfds_all);
577
/* Block signal while modifying process_list */
578
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
579
if(ret < 0){
580
perror("sigprocmask");
581
exitstatus = EXIT_FAILURE;
582
goto end;
583
}
584
/* Delete this process entry from the list */
585
if(process_list == proc){
586
/* First one - simple */
587
process_list = proc->next;
588
} else {
589
/* Second one or later */
590
for(process *p = process_list; p != NULL; p = p->next){
591
if(p->next == proc){
592
p->next = proc->next;
593
break;
374
if (process_list != NULL){
375
while(true){
376
fd_set rfds = rfds_all;
377
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
378
if (select_ret == -1){
379
perror(argv[0]);
380
goto end;
381
}else{
382
for(process *process_itr = process_list; process_itr != NULL;
383
process_itr = process_itr->next){
384
if(FD_ISSET(process_itr->fd, &rfds)){
385
if(process_itr->buffer_length + BUFFER_SIZE
386
> process_itr->buffer_size){
387
process_itr->buffer = realloc(process_itr->buffer,
388
process_itr->buffer_size
389
+ (size_t) BUFFER_SIZE);
390
if (process_itr->buffer == NULL){
391
perror(argv[0]);
392
goto end;
393
}
394
process_itr->buffer_size += BUFFER_SIZE;
395
}
396
ret = read(process_itr->fd, process_itr->buffer
397
+ process_itr->buffer_length, BUFFER_SIZE);
398
if(ret < 0){
399
/* Read error from this process; ignore it */
400
continue;
401
}
402
process_itr->buffer_length += (size_t) ret;
403
if(ret == 0){
404
/* got EOF */
405
/* wait for process exit */
406
int status;
407
waitpid(process_itr->pid, &status, 0);
408
if(WIFEXITED(status) and WEXITSTATUS(status) == 0){
409
for(size_t written = 0;
410
written < process_itr->buffer_length;){
411
ret = write(STDOUT_FILENO,
412
process_itr->buffer + written,
413
process_itr->buffer_length - written);
414
if(ret < 0){
415
perror(argv[0]);
416
goto end;
417
}
418
written += (size_t)ret;
419
}
420
goto end;
421
} else {
422
FD_CLR(process_itr->fd, &rfds_all);
594
423
}
595
424
}
596
425
}
597
/* We are done modifying process list, so unblock signal */
598
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
599
NULL);
600
if(ret < 0){
601
perror("sigprocmask");
602
}
603
free(proc->buffer);
604
free(proc);
605
/* We deleted this process from the list, so we can't go
606
proc->next. Therefore, start over from the beginning of
607
the process list */
608
break;
609
}
610
/* This process exited nicely, so print its buffer */
611
for(size_t written = 0; written < proc->buffer_length;
612
written += (size_t)ret){
613
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO,
614
proc->buffer + written,
615
proc->buffer_length
616
- written));
617
if(ret < 0){
618
perror("write");
619
exitstatus = EXIT_FAILURE;
620
goto end;
621
}
622
}
623
goto end;
624
}
625
/* This process has not completed. Does it have any output? */
626
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
627
/* This process had nothing to say at this time */
628
continue;
629
}
630
/* Before reading, make the process' data buffer large enough */
631
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
632
proc->buffer = realloc(proc->buffer, proc->buffer_size
633
+ (size_t) BUFFER_SIZE);
634
if (proc->buffer == NULL){
635
perror("malloc");
636
exitstatus = EXIT_FAILURE;
637
goto end;
638
}
639
proc->buffer_size += BUFFER_SIZE;
640
}
641
/* Read from the process */
642
ret = read(proc->fd, proc->buffer + proc->buffer_length,
643
BUFFER_SIZE);
644
if(ret < 0){
645
/* Read error from this process; ignore the error */
646
continue;
647
}
648
if(ret == 0){
649
/* got EOF */
650
proc->eof = true;
651
} else {
652
proc->buffer_length += (size_t) ret;
426
}
653
427
}
654
428
}
655
429
}
656
if(process_list == NULL){
657
fprintf(stderr, "All plugin processes failed, exiting\n");
658
exitstatus = EXIT_FAILURE;
659
}
660
430
661
431
end:
662
/* Restore old signal handler */
663
sigaction(SIGCHLD, &old_sigchld_action, NULL);
664
665
free(plus_argv);
666
667
/* Free the plugin list */
668
for(plugin *next; plugin_list != NULL; plugin_list = next){
669
next = plugin_list->next;
670
free(plugin_list->argv);
671
free(plugin_list);
672
}
673
674
if(dir != NULL){
675
closedir(dir);
676
}
677
678
/* Free the process list and kill the processes */
679
for(process *next; process_list != NULL; process_list = next){
680
next = process_list->next;
681
close(process_list->fd);
682
kill(process_list->pid, SIGTERM);
683
free(process_list->buffer);
684
free(process_list);
685
}
686
687
/* Wait for any remaining child processes to terminate */
688
do{
689
ret = wait(NULL);
690
} while(ret >= 0);
691
if(errno != ECHILD){
692
perror("wait");
693
}
694
432
for(process *process_itr = process_list; process_itr != NULL;
433
process_itr = process_itr->next){
434
close(process_itr->fd);
435
kill(process_itr->pid, SIGTERM);
436
free(process_itr->buffer);
437
}
438
439
while(true){
440
int status;
441
ret = wait(&status);
442
if (ret == -1){
443
if(errno != ECHILD){
444
perror("wait");
445
}
446
break;
447
}
448
}
695
449
return exitstatus;
696
450
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0