Deleted Added
sdiff udiff text old ( 266114 ) new ( 276605 )
full compact
modstack.c (266114) modstack.c (276605)
1/*
2 * services/modstack.c - stack of modules
3 *
4 * Copyright (c) 2007, NLnet Labs. All rights reserved.
5 *
6 * This software is open source.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 29 unchanged lines hidden (view full) ---

38 *
39 * This file contains functions to help maintain a stack of modules.
40 */
41#include "config.h"
42#include <ctype.h>
43#include "services/modstack.h"
44#include "util/module.h"
45#include "util/fptr_wlist.h"
1/*
2 * services/modstack.c - stack of modules
3 *
4 * Copyright (c) 2007, NLnet Labs. All rights reserved.
5 *
6 * This software is open source.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 29 unchanged lines hidden (view full) ---

38 *
39 * This file contains functions to help maintain a stack of modules.
40 */
41#include "config.h"
42#include <ctype.h>
43#include "services/modstack.h"
44#include "util/module.h"
45#include "util/fptr_wlist.h"
46#include "dns64/dns64.h"
46#include "iterator/iterator.h"
47#include "validator/validator.h"
48
49#ifdef WITH_PYTHONMODULE
50#include "pythonmod/pythonmod.h"
51#endif
52
53/** count number of modules (words) in the string */
54static int
55count_modules(const char* s)
56{
57 int num = 0;
58 if(!s)
59 return 0;
60 while(*s) {
61 /* skip whitespace */
47#include "iterator/iterator.h"
48#include "validator/validator.h"
49
50#ifdef WITH_PYTHONMODULE
51#include "pythonmod/pythonmod.h"
52#endif
53
54/** count number of modules (words) in the string */
55static int
56count_modules(const char* s)
57{
58 int num = 0;
59 if(!s)
60 return 0;
61 while(*s) {
62 /* skip whitespace */
62 while(*s && isspace((int)*s))
63 while(*s && isspace((unsigned char)*s))
63 s++;
64 s++;
64 if(*s && !isspace((int)*s)) {
65 if(*s && !isspace((unsigned char)*s)) {
65 /* skip identifier */
66 num++;
66 /* skip identifier */
67 num++;
67 while(*s && !isspace((int)*s))
68 while(*s && !isspace((unsigned char)*s))
68 s++;
69 }
70 }
71 return num;
72}
73
74void
75modstack_init(struct module_stack* stack)

--- 35 unchanged lines hidden (view full) ---

111}
112
113/** The list of module names */
114const char**
115module_list_avail(void)
116{
117 /* these are the modules available */
118 static const char* names[] = {
69 s++;
70 }
71 }
72 return num;
73}
74
75void
76modstack_init(struct module_stack* stack)

--- 35 unchanged lines hidden (view full) ---

112}
113
114/** The list of module names */
115const char**
116module_list_avail(void)
117{
118 /* these are the modules available */
119 static const char* names[] = {
120 "dns64",
119#ifdef WITH_PYTHONMODULE
120 "python",
121#endif
122 "validator",
123 "iterator",
124 NULL};
125 return names;
126}
127
128/** func block get function type */
129typedef struct module_func_block* (*fbgetfunctype)(void);
130
131/** The list of module func blocks */
132static fbgetfunctype*
133module_funcs_avail(void)
134{
135 static struct module_func_block* (*fb[])(void) = {
121#ifdef WITH_PYTHONMODULE
122 "python",
123#endif
124 "validator",
125 "iterator",
126 NULL};
127 return names;
128}
129
130/** func block get function type */
131typedef struct module_func_block* (*fbgetfunctype)(void);
132
133/** The list of module func blocks */
134static fbgetfunctype*
135module_funcs_avail(void)
136{
137 static struct module_func_block* (*fb[])(void) = {
138 &dns64_get_funcblock,
136#ifdef WITH_PYTHONMODULE
137 &pythonmod_get_funcblock,
138#endif
139 &val_get_funcblock,
140 &iter_get_funcblock,
141 NULL};
142 return fb;
143}
144
145struct
146module_func_block* module_factory(const char** str)
147{
148 int i = 0;
149 const char* s = *str;
150 const char** names = module_list_avail();
151 fbgetfunctype* fb = module_funcs_avail();
139#ifdef WITH_PYTHONMODULE
140 &pythonmod_get_funcblock,
141#endif
142 &val_get_funcblock,
143 &iter_get_funcblock,
144 NULL};
145 return fb;
146}
147
148struct
149module_func_block* module_factory(const char** str)
150{
151 int i = 0;
152 const char* s = *str;
153 const char** names = module_list_avail();
154 fbgetfunctype* fb = module_funcs_avail();
152 while(*s && isspace((int)*s))
155 while(*s && isspace((unsigned char)*s))
153 s++;
154 while(names[i]) {
155 if(strncmp(names[i], s, strlen(names[i])) == 0) {
156 s += strlen(names[i]);
157 *str = s;
158 return (*fb[i])();
159 }
160 i++;

--- 52 unchanged lines hidden --- 		156 s++;
157 while(names[i]) {
158 if(strncmp(names[i], s, strlen(names[i])) == 0) {
159 s += strlen(names[i]);
160 *str = s;
161 return (*fb[i])();
162 }
163 i++;

--- 52 unchanged lines hidden ---