This is a test fix after commit
5cbe8d07fb23db630e76d18022f20368312720ec
to see what can be done. Truth is that not much. I could fix how
ranges are allocated, but the fact there is pointers to shared
networks and network names reallocating the memory spaces is not
really going to work. The only way to truly fix this issue is to
create better data structures. As you can expect that is a major
change, and will take some time to implement.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see <http://www.gnu.org/licenses/>.
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef DEFAULTS_H
# define DEFAULTS_H 1
#ifndef DEFAULTS_H
# define DEFAULTS_H 1
static const int MAXLEN = 1024;
/* Total number of characters in all shared network names */
static const int MAXLEN = 1024;
/* Total number of characters in all shared network names */
-static const int SHARED_NETWORKS_NAMES = 65536;
+static const unsigned int SHARED_NETWORKS_NAMES = 65536;
/* Maximum number of shared networks */
/* Maximum number of shared networks */
-static const int SHARED_NETWORKS = 8192;
+static const unsigned int SHARED_NETWORKS = 8192;
/* Maximum number of ranges */
/* Maximum number of ranges */
-static const unsigned int RANGES = 65536;
-/* Merge sort split size */
-static const int MIN_MERGE_SIZE = 8;
-
-#endif /* DEFAULTS_H */
/* Global allocations, counter resets etc */
int prepare_memory()
{
/* Global allocations, counter resets etc */
int prepare_memory()
{
num_ranges = num_shared_networks = 0;
shared_networks =
safe_malloc(sizeof(struct shared_network_t) * SHARED_NETWORKS);
num_ranges = num_shared_networks = 0;
shared_networks =
safe_malloc(sizeof(struct shared_network_t) * SHARED_NETWORKS);
+void *safe_realloc(void *ptr, const size_t size);
char *safe_strdup(const char *str) __attribute__ ((nonnull(1)));
void print_version(void) __attribute__ ((noreturn));
void usage(int status) __attribute__ ((noreturn));
char *safe_strdup(const char *str) __attribute__ ((nonnull(1)));
void print_version(void) __attribute__ ((noreturn));
void usage(int status) __attribute__ ((noreturn));
range_p->backups = 0;
range_p->shared_net = shared_p;
num_ranges++;
range_p->backups = 0;
range_p->shared_net = shared_p;
num_ranges++;
- if (RANGES < num_ranges) {
- errx(EXIT_FAILURE,
- "parse_config: increase default.h RANGES and recompile.");
+ if (RANGES < num_ranges + 1) {
+ RANGES *= 2;
+ ranges =
+ safe_realloc(ranges,
+ sizeof(struct
+ range_t) *
+ RANGES);
+ range_p = ranges + num_ranges;
}
newclause = true;
break;
}
newclause = true;
break;
errx(EXIT_FAILURE,
"parse_config: increase default.h SHARED_NETWORKS_NAMES and recompile");
}
errx(EXIT_FAILURE,
"parse_config: increase default.h SHARED_NETWORKS_NAMES and recompile");
}
- if (SHARED_NETWORKS < num_shared_networks) {
- /* FIXME: make this go
+ if (SHARED_NETWORKS <
+ num_shared_networks + 2) {
+ /* FIXME: make this
* away by reallocationg
* more space. */
errx(EXIT_FAILURE,
"parse_config: increase default.h SHARED_NETWORKS and recompile");
* away by reallocationg
* more space. */
errx(EXIT_FAILURE,
"parse_config: increase default.h SHARED_NETWORKS and recompile");
argument = 0;
braces_shared = braces;
break;
argument = 0;
braces_shared = braces;
break;
void *safe_malloc(const size_t size)
{
void *ret = malloc(size);
void *safe_malloc(const size_t size)
{
void *ret = malloc(size);
if (ret == NULL) {
err(EXIT_FAILURE,
"safe_malloc: cannot allocate %lu bytes: ", size);
if (ret == NULL) {
err(EXIT_FAILURE,
"safe_malloc: cannot allocate %lu bytes: ", size);
+/* Simple memory reallocation wrapper */
+void *safe_realloc(void *ptr, const size_t size)
+{
+ void *ret = realloc(ptr, size);
+
+ if (!ret && size)
+ err(EXIT_FAILURE,
+ "safe_realloc: cannot allocate %zu bytes", size);
+ return ret;
+}
+
/* Simple strdup wrapper */
char *safe_strdup(const char *str)
{
/* Simple strdup wrapper */
char *safe_strdup(const char *str)
{
"This is free software: you are free to change and redistribute it.\n");
fprintf(stdout,
"There is NO WARRANTY, to the extent permitted by law.\n");
"This is free software: you are free to change and redistribute it.\n");
fprintf(stdout,
"There is NO WARRANTY, to the extent permitted by law.\n");
#include <err.h>
#include "dhcpd-pools.h"
#include <err.h>
#include "dhcpd-pools.h"
/* Sort functions for range sorting */
int intcomp(const void *x, const void *y)
/* Sort functions for range sorting */
int intcomp(const void *x, const void *y)
{
int left, right, i;
struct range_t hold;
{
int left, right, i;
struct range_t hold;
+ /* Merge sort split size */
+ static const int MIN_MERGE_SIZE = 8;
if (size < MIN_MERGE_SIZE) {
for (left = 0; left < size; left++) {
if (size < MIN_MERGE_SIZE) {
for (left = 0; left < size; left++) {