From 3731fd9ccce8d93a0bb22f8ba0db277652537335 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 1 Apr 2011 10:59:32 +0000
Subject: [PATCH] Merged revisions 312286,312288 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r312286 | tilghman | 2011-04-01 05:44:33 -0500 (Fri, 01 Apr 2011) | 2 lines
Reload must react correctly against a possibly changed table, so dropping the conditional reload flag.
................
r312288 | tilghman | 2011-04-01 05:58:45 -0500 (Fri, 01 Apr 2011) | 21 lines
Merged revisions 312287 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r312287 | tilghman | 2011-04-01 05:51:24 -0500 (Fri, 01 Apr 2011) | 14 lines
Merged revisions 312285 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r312285 | tilghman | 2011-04-01 05:36:42 -0500 (Fri, 01 Apr 2011) | 7 lines
Found some leaking file descriptors while looking at ast_FD_SETSIZE dead code.
(issue #18969)
Reported by: oej
Patches:
20110315__issue18969__14.diff.txt uploaded by tilghman (license 14)
........
................
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@312289 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
addons/cdr_mysql.c | 5 ++++-
include/asterisk/select.h | 3 ++-
main/asterisk.c | 6 +++++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c
index 504163a21f..167a5af58d 100644
--- a/addons/cdr_mysql.c
+++ b/addons/cdr_mysql.c
@@ -428,7 +428,7 @@ static int my_load_module(int reload)
int res;
struct ast_config *cfg;
struct ast_variable *var;
- struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
+ struct ast_flags config_flags = { 0 };
struct column *entry;
char *temp;
struct ast_str *compat;
@@ -439,6 +439,9 @@ static int my_load_module(int reload)
my_bool my_bool_true = 1;
#endif
+ /* Cannot use a conditionally different flag, because the table layout may
+ * have changed, which is not detectable by config file change detection,
+ * but should still cause the configuration to be re-parsed. */
cfg = ast_config_load(config, config_flags);
if (!cfg) {
ast_log(LOG_WARNING, "Unable to load config for mysql CDR's: %s\n", config);
diff --git a/include/asterisk/select.h b/include/asterisk/select.h
index ac2284fc71..a8f7c3c607 100644
--- a/include/asterisk/select.h
+++ b/include/asterisk/select.h
@@ -38,8 +38,9 @@ extern unsigned int ast_FD_SETSIZE;
#if !defined(HAVE_VARIABLE_FDSET) && defined(CONFIGURE_RAN_AS_ROOT)
#define ast_fdset fd_set
#else
+#define ast_FDMAX 32768
typedef struct {
- TYPEOF_FD_SET_FDS_BITS fds_bits[4096 / SIZEOF_FD_SET_FDS_BITS]; /* 32768 bits */
+ TYPEOF_FD_SET_FDS_BITS fds_bits[ast_FDMAX / 8 / SIZEOF_FD_SET_FDS_BITS]; /* 32768 bits */
} ast_fdset;
#undef FD_ZERO
diff --git a/main/asterisk.c b/main/asterisk.c
index 749491515e..4d95466f3d 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -3402,6 +3402,7 @@ int main(int argc, char *argv[])
fd2 = (l.rlim_cur > sizeof(readers) * 8 ? sizeof(readers) * 8 : l.rlim_cur) - 1;
if (dup2(fd, fd2) < 0) {
ast_log(LOG_WARNING, "Cannot open maximum file descriptor %d at boot? %s\n", fd2, strerror(errno));
+ close(fd);
break;
}
@@ -3410,9 +3411,12 @@ int main(int argc, char *argv[])
if (ast_select(fd2 + 1, &readers, NULL, NULL, &tv) < 0) {
ast_log(LOG_WARNING, "Maximum select()able file descriptor is %d\n", FD_SETSIZE);
}
+ ast_FD_SETSIZE = l.rlim_cur > ast_FDMAX ? ast_FDMAX : l.rlim_cur;
+ close(fd);
+ close(fd2);
} while (0);
#elif defined(HAVE_VARIABLE_FDSET)
- ast_FD_SETSIZE = l.rlim_cur;
+ ast_FD_SETSIZE = l.rlim_cur > ast_FDMAX ? ast_FDMAX : l.rlim_cur;
#endif /* !defined(CONFIGURE_RAN_AS_ROOT) */
if ((!rungroup) && !ast_strlen_zero(ast_config_AST_RUN_GROUP))
--
GitLab