rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-05-13 06:04:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

racoon/session: Honor file descriptor maximum

Browse Source 
Dynamically allocate a big enough file descriptor set for select(). A
better solution would be to use kqueue() instead of select().

Update #4360
This commit is contained in:
Christian Mauderer 2021-02-23 14:18:26 +01:00
parent 3cdf289424
commit a7273c0704
2 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipsec-tools/src/racoon/rtems-bsd-racoon-session-data.h
View File

@ -2,11 +2,11 @@
#include <rtems/linkersets.h> #include <rtems/linkersets.h>
#include "rtems-bsd-racoon-data.h" #include "rtems-bsd-racoon-data.h"
/* session.c */ /* session.c */
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static fd_set active_mask); RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static _types_fd_set *allocated_active_mask);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static fd_set preset_mask); RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static _types_fd_set *allocated_preset_mask);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int nfds); RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int nfds);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int signals[]); RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static int signals[]);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static sig_atomic_t volatile volatile sigreq[]); RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static sig_atomic_t volatile volatile sigreq[]);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct fd_monitor fd_monitors[]); RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct fd_monitor *allocated_fd_monitors);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct fd_monitor_list fd_monitor_tree[]); RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct fd_monitor_list fd_monitor_tree[]);
RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct sched scflushsa); RTEMS_LINKER_RWSET_CONTENT(bsd_prog_racoon, static struct sched scflushsa);

40
ipsec-tools/src/racoon/session.c
View File

@ -65,6 +65,10 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <paths.h> #include <paths.h>
#include <err.h> #include <err.h>
#ifdef __rtems__
#include <sys/param.h>
#include <rtems/libio_.h>
#endif /* __rtems__ */
#include <netinet/in.h> #include <netinet/in.h>
#include <resolv.h> #include <resolv.h>
@ -123,8 +127,16 @@ static void check_sigreq __P((void));
static void check_flushsa __P((void)); static void check_flushsa __P((void));
static int close_sockets __P((void)); static int close_sockets __P((void));
#ifndef __rtems__
static fd_set preset_mask, active_mask; static fd_set preset_mask, active_mask;
static struct fd_monitor fd_monitors[FD_SETSIZE]; static struct fd_monitor fd_monitors[FD_SETSIZE];
#else /* __rtems__ */
static fd_set *allocated_preset_mask, *allocated_active_mask;
static struct fd_monitor *allocated_fd_monitors;
#define preset_mask (*allocated_preset_mask)
#define active_mask (*allocated_active_mask)
#define fd_monitors (allocated_fd_monitors)
#endif /* __rtems__ */
static TAILQ_HEAD(fd_monitor_list, fd_monitor) fd_monitor_tree[NUM_PRIORITIES]; static TAILQ_HEAD(fd_monitor_list, fd_monitor) fd_monitor_tree[NUM_PRIORITIES];
static int nfds = 0; static int nfds = 0;
@ -134,7 +146,11 @@ static struct sched scflushsa = SCHED_INITIALIZER();
void void
monitor_fd(int fd, int (*callback)(void *, int), void *ctx, int priority) monitor_fd(int fd, int (*callback)(void *, int), void *ctx, int priority)
{ {
#ifndef __rtems__
if (fd < 0 || fd >= FD_SETSIZE) { if (fd < 0 || fd >= FD_SETSIZE) {
#else /* __rtems__ */
if (fd < 0 || fd >= rtems_libio_number_iops) {
#endif /* __rtems__ */
plog(LLV_ERROR, LOCATION, NULL, "fd_set overrun"); plog(LLV_ERROR, LOCATION, NULL, "fd_set overrun");
exit(1); exit(1);
} }
@ -158,7 +174,11 @@ monitor_fd(int fd, int (*callback)(void *, int), void *ctx, int priority)
void void
unmonitor_fd(int fd) unmonitor_fd(int fd)
{ {
#ifndef __rtems__
if (fd < 0 || fd >= FD_SETSIZE) { if (fd < 0 || fd >= FD_SETSIZE) {
#else /* __rtems__ */
if (fd < 0 || fd >= rtems_libio_number_iops) {
#endif /* __rtems__ */
plog(LLV_ERROR, LOCATION, NULL, "fd_set overrun"); plog(LLV_ERROR, LOCATION, NULL, "fd_set overrun");
exit(1); exit(1);
} }
@ -186,7 +206,22 @@ session(void)
struct fd_monitor *fdm; struct fd_monitor *fdm;
nfds = 0; nfds = 0;
#ifndef __rtems__
FD_ZERO(&preset_mask); FD_ZERO(&preset_mask);
#else /* __rtems__ */
allocated_preset_mask = calloc(sizeof(fd_set),
howmany(rtems_libio_number_iops, sizeof(fd_set) * 8));
if (allocated_preset_mask == NULL)
errx(1, "failed to allocate preset_mask");
allocated_active_mask = calloc(sizeof(fd_set),
howmany(rtems_libio_number_iops, sizeof(fd_set) * 8));
if (allocated_active_mask == NULL)
errx(1, "failed to allocate active_mask");
allocated_fd_monitors = calloc(
rtems_libio_number_iops, sizeof(struct fd_monitor));
if (allocated_fd_monitors == NULL)
errx(1, "failed to allocate fd_monitors");
#endif /* __rtems__ */
for (i = 0; i < NUM_PRIORITIES; i++) for (i = 0; i < NUM_PRIORITIES; i++)
TAILQ_INIT(&fd_monitor_tree[i]); TAILQ_INIT(&fd_monitor_tree[i]);
@ -356,6 +391,11 @@ close_session()
flushsainfo(); flushsainfo();
close_sockets(); close_sockets();
backupsa_clean(); backupsa_clean();
#ifdef __rtems__
free(allocated_preset_mask); allocated_preset_mask = NULL;
free(allocated_active_mask); allocated_active_mask = NULL;
free(allocated_fd_monitors); allocated_fd_monitors = NULL;
#endif /* __rtems__ */
plog(LLV_INFO, LOCATION, NULL, "racoon process %d shutdown\n", getpid()); plog(LLV_INFO, LOCATION, NULL, "racoon process %d shutdown\n", getpid());