parse.c revision 1.8 1 1.8 dyoung /* $NetBSD: parse.c,v 1.8 2008/05/19 18:00:31 dyoung Exp $ */
2 1.2 dyoung
3 1.2 dyoung /*-
4 1.7 dyoung * Copyright (c) 2008 David Young. All rights reserved.
5 1.2 dyoung *
6 1.2 dyoung * Redistribution and use in source and binary forms, with or without
7 1.2 dyoung * modification, are permitted provided that the following conditions
8 1.2 dyoung * are met:
9 1.2 dyoung * 1. Redistributions of source code must retain the above copyright
10 1.2 dyoung * notice, this list of conditions and the following disclaimer.
11 1.2 dyoung * 2. Redistributions in binary form must reproduce the above copyright
12 1.2 dyoung * notice, this list of conditions and the following disclaimer in the
13 1.2 dyoung * documentation and/or other materials provided with the distribution.
14 1.2 dyoung *
15 1.2 dyoung * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
16 1.2 dyoung * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
17 1.2 dyoung * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
18 1.2 dyoung * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
19 1.2 dyoung * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 1.2 dyoung * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 1.2 dyoung * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 1.2 dyoung * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 1.2 dyoung * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 1.2 dyoung * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 1.2 dyoung * SUCH DAMAGE.
26 1.2 dyoung */
27 1.2 dyoung
28 1.1 dyoung #include <err.h>
29 1.1 dyoung #include <errno.h>
30 1.1 dyoung #include <limits.h>
31 1.1 dyoung #include <netdb.h>
32 1.1 dyoung #include <stddef.h>
33 1.1 dyoung #include <stdio.h>
34 1.1 dyoung #include <stdlib.h>
35 1.1 dyoung #include <string.h>
36 1.1 dyoung
37 1.1 dyoung #include <arpa/inet.h>
38 1.1 dyoung #include <sys/param.h>
39 1.1 dyoung #include <net/if.h>
40 1.6 dyoung #include <net/if_dl.h>
41 1.1 dyoung #include <netatalk/at.h>
42 1.1 dyoung #include <netiso/iso.h>
43 1.1 dyoung
44 1.1 dyoung #include "env.h"
45 1.1 dyoung #include "parse.h"
46 1.1 dyoung #include "util.h"
47 1.1 dyoung
48 1.1 dyoung #define dbg_warnx(__fmt, ...) /* empty */
49 1.1 dyoung
50 1.1 dyoung static int parser_default_init(struct parser *);
51 1.1 dyoung static int pbranch_init(struct parser *);
52 1.1 dyoung static int pkw_init(struct parser *);
53 1.1 dyoung
54 1.1 dyoung static int pterm_match(const struct parser *, const struct match *,
55 1.1 dyoung struct match *, int, const char *);
56 1.1 dyoung
57 1.1 dyoung static int paddr_match(const struct parser *, const struct match *,
58 1.1 dyoung struct match *, int, const char *);
59 1.1 dyoung
60 1.1 dyoung static int pbranch_match(const struct parser *, const struct match *,
61 1.1 dyoung struct match *, int, const char *);
62 1.1 dyoung
63 1.1 dyoung static int piface_match(const struct parser *, const struct match *,
64 1.1 dyoung struct match *, int, const char *);
65 1.1 dyoung
66 1.1 dyoung static int pstr_match(const struct parser *, const struct match *,
67 1.1 dyoung struct match *, int, const char *);
68 1.1 dyoung
69 1.1 dyoung static int pinteger_match(const struct parser *, const struct match *,
70 1.1 dyoung struct match *, int, const char *);
71 1.1 dyoung
72 1.1 dyoung static int pkw_match(const struct parser *, const struct match *,
73 1.1 dyoung struct match *, int, const char *);
74 1.1 dyoung
75 1.1 dyoung const struct parser_methods pterm_methods = {
76 1.1 dyoung .pm_match = pterm_match
77 1.1 dyoung , .pm_init = NULL
78 1.1 dyoung };
79 1.1 dyoung
80 1.1 dyoung const struct parser_methods pstr_methods = {
81 1.1 dyoung .pm_match = pstr_match
82 1.1 dyoung , .pm_init = parser_default_init
83 1.1 dyoung };
84 1.1 dyoung
85 1.1 dyoung const struct parser_methods pinteger_methods = {
86 1.1 dyoung .pm_match = pinteger_match
87 1.1 dyoung , .pm_init = parser_default_init
88 1.1 dyoung };
89 1.1 dyoung
90 1.1 dyoung const struct parser_methods paddr_methods = {
91 1.1 dyoung .pm_match = paddr_match
92 1.1 dyoung , .pm_init = parser_default_init
93 1.1 dyoung };
94 1.1 dyoung
95 1.1 dyoung const struct parser_methods piface_methods = {
96 1.1 dyoung .pm_match = piface_match
97 1.1 dyoung , .pm_init = parser_default_init
98 1.1 dyoung };
99 1.1 dyoung
100 1.1 dyoung const struct parser_methods pbranch_methods = {
101 1.1 dyoung .pm_match = pbranch_match
102 1.1 dyoung , .pm_init = pbranch_init
103 1.1 dyoung };
104 1.1 dyoung
105 1.1 dyoung const struct parser_methods pkw_methods = {
106 1.1 dyoung .pm_match = pkw_match
107 1.1 dyoung , .pm_init = pkw_init
108 1.1 dyoung };
109 1.1 dyoung
110 1.1 dyoung static int
111 1.1 dyoung match_setenv(const struct match *im, struct match *om, const char *key,
112 1.1 dyoung prop_object_t o)
113 1.1 dyoung {
114 1.1 dyoung if (im == NULL)
115 1.1 dyoung om->m_env = prop_dictionary_create();
116 1.1 dyoung else
117 1.1 dyoung om->m_env = prop_dictionary_copy(im->m_env);
118 1.1 dyoung
119 1.1 dyoung if (om->m_env == NULL)
120 1.1 dyoung goto delobj;
121 1.1 dyoung
122 1.1 dyoung if (key != NULL && !prop_dictionary_set(om->m_env, key, o))
123 1.1 dyoung goto deldict;
124 1.1 dyoung
125 1.1 dyoung if (o != NULL)
126 1.1 dyoung prop_object_release((prop_object_t)o);
127 1.1 dyoung
128 1.1 dyoung return 0;
129 1.1 dyoung deldict:
130 1.1 dyoung prop_object_release((prop_object_t)om->m_env);
131 1.1 dyoung om->m_env = NULL;
132 1.1 dyoung delobj:
133 1.1 dyoung prop_object_release((prop_object_t)o);
134 1.1 dyoung errno = ENOMEM;
135 1.1 dyoung return -1;
136 1.1 dyoung }
137 1.1 dyoung
138 1.1 dyoung int
139 1.1 dyoung pstr_match(const struct parser *p, const struct match *im, struct match *om,
140 1.1 dyoung int argidx, const char *arg)
141 1.1 dyoung {
142 1.1 dyoung prop_object_t o;
143 1.1 dyoung const struct pstr *ps = (const struct pstr *)p;
144 1.1 dyoung uint8_t buf[128];
145 1.1 dyoung int len;
146 1.1 dyoung
147 1.5 dyoung if (arg == NULL) {
148 1.5 dyoung errno = EINVAL;
149 1.5 dyoung return -1;
150 1.5 dyoung }
151 1.5 dyoung
152 1.1 dyoung len = (int)sizeof(buf);
153 1.1 dyoung if (get_string(arg, NULL, buf, &len) == NULL) {
154 1.1 dyoung errno = EINVAL;
155 1.1 dyoung return -1;
156 1.1 dyoung }
157 1.1 dyoung
158 1.1 dyoung o = (prop_object_t)prop_data_create_data(buf, len);
159 1.1 dyoung
160 1.1 dyoung if (o == NULL) {
161 1.1 dyoung errno = ENOMEM;
162 1.1 dyoung return -1;
163 1.1 dyoung }
164 1.1 dyoung
165 1.1 dyoung if (match_setenv(im, om, ps->ps_key, o) == -1)
166 1.1 dyoung return -1;
167 1.1 dyoung
168 1.1 dyoung om->m_argidx = argidx;
169 1.1 dyoung om->m_parser = p;
170 1.1 dyoung om->m_nextparser = p->p_nextparser;
171 1.1 dyoung
172 1.1 dyoung return 0;
173 1.1 dyoung }
174 1.1 dyoung
175 1.1 dyoung int
176 1.1 dyoung pinteger_match(const struct parser *p, const struct match *im, struct match *om,
177 1.1 dyoung int argidx, const char *arg)
178 1.1 dyoung {
179 1.1 dyoung prop_object_t o;
180 1.1 dyoung const struct pinteger *pi = (const struct pinteger *)p;
181 1.1 dyoung char *end;
182 1.1 dyoung int64_t val;
183 1.5 dyoung
184 1.5 dyoung if (arg == NULL) {
185 1.5 dyoung errno = EINVAL;
186 1.5 dyoung return -1;
187 1.5 dyoung }
188 1.5 dyoung
189 1.1 dyoung val = strtoimax(arg, &end, pi->pi_base);
190 1.1 dyoung if ((val == INTMAX_MIN || val == INTMAX_MAX) && errno == ERANGE)
191 1.1 dyoung return -1;
192 1.1 dyoung
193 1.1 dyoung if (*end != '\0') {
194 1.1 dyoung errno = EINVAL;
195 1.1 dyoung return -1;
196 1.1 dyoung }
197 1.1 dyoung
198 1.1 dyoung if (val < pi->pi_min || val > pi->pi_max) {
199 1.1 dyoung errno = ERANGE;
200 1.1 dyoung return -1;
201 1.1 dyoung }
202 1.1 dyoung
203 1.1 dyoung o = (prop_object_t)prop_number_create_integer(val);
204 1.1 dyoung
205 1.1 dyoung if (o == NULL) {
206 1.1 dyoung errno = ENOMEM;
207 1.1 dyoung return -1;
208 1.1 dyoung }
209 1.1 dyoung
210 1.1 dyoung if (match_setenv(im, om, pi->pi_key, o) == -1)
211 1.1 dyoung return -1;
212 1.1 dyoung
213 1.1 dyoung om->m_argidx = argidx;
214 1.1 dyoung om->m_parser = p;
215 1.1 dyoung om->m_nextparser = p->p_nextparser;
216 1.1 dyoung
217 1.1 dyoung return 0;
218 1.1 dyoung }
219 1.1 dyoung
220 1.1 dyoung static int
221 1.6 dyoung parse_linkaddr(const char *addr, struct sockaddr_storage *ss)
222 1.6 dyoung {
223 1.6 dyoung static const size_t maxlen =
224 1.6 dyoung sizeof(*ss) - offsetof(struct sockaddr_dl, sdl_data[0]);
225 1.6 dyoung enum {
226 1.6 dyoung LLADDR_S_INITIAL = 0,
227 1.7 dyoung LLADDR_S_ONE_OCTET = 1,
228 1.7 dyoung LLADDR_S_TWO_OCTETS = 2,
229 1.7 dyoung LLADDR_S_COLON = 3
230 1.6 dyoung } state = LLADDR_S_INITIAL;
231 1.6 dyoung uint8_t octet = 0, val;
232 1.6 dyoung struct sockaddr_dl *sdl;
233 1.6 dyoung const char *p;
234 1.6 dyoung int i;
235 1.6 dyoung
236 1.6 dyoung memset(ss, 0, sizeof(*ss));
237 1.6 dyoung ss->ss_family = AF_LINK;
238 1.6 dyoung sdl = (struct sockaddr_dl *)ss;
239 1.6 dyoung
240 1.6 dyoung for (i = 0, p = addr; i < maxlen; p++) {
241 1.7 dyoung dbg_warnx("%s.%d: *p == %c, state %d", __func__, __LINE__, *p,
242 1.7 dyoung state);
243 1.6 dyoung if (*p == '\0') {
244 1.7 dyoung dbg_warnx("%s.%d", __func__, __LINE__);
245 1.6 dyoung if (state != LLADDR_S_ONE_OCTET &&
246 1.6 dyoung state != LLADDR_S_TWO_OCTETS)
247 1.6 dyoung return -1;
248 1.7 dyoung dbg_warnx("%s.%d", __func__, __LINE__);
249 1.6 dyoung sdl->sdl_data[i++] = octet;
250 1.6 dyoung sdl->sdl_len =
251 1.6 dyoung offsetof(struct sockaddr_dl, sdl_data[i]);
252 1.7 dyoung sdl->sdl_alen = i;
253 1.6 dyoung return 0;
254 1.6 dyoung }
255 1.6 dyoung if (*p == ':') {
256 1.7 dyoung dbg_warnx("%s.%d", __func__, __LINE__);
257 1.6 dyoung if (state != LLADDR_S_ONE_OCTET &&
258 1.6 dyoung state != LLADDR_S_TWO_OCTETS)
259 1.6 dyoung return -1;
260 1.7 dyoung dbg_warnx("%s.%d", __func__, __LINE__);
261 1.6 dyoung sdl->sdl_data[i++] = octet;
262 1.6 dyoung state = LLADDR_S_COLON;
263 1.7 dyoung continue;
264 1.6 dyoung }
265 1.6 dyoung if ('a' <= *p && *p <= 'f')
266 1.6 dyoung val = 10 + *p - 'a';
267 1.6 dyoung else if ('A' <= *p && *p <= 'F')
268 1.6 dyoung val = 10 + *p - 'A';
269 1.6 dyoung else if ('0' <= *p && *p <= '9')
270 1.6 dyoung val = *p - '0';
271 1.6 dyoung else
272 1.6 dyoung return -1;
273 1.6 dyoung
274 1.7 dyoung dbg_warnx("%s.%d", __func__, __LINE__);
275 1.6 dyoung if (state == LLADDR_S_ONE_OCTET) {
276 1.6 dyoung state = LLADDR_S_TWO_OCTETS;
277 1.6 dyoung octet <<= 4;
278 1.6 dyoung octet |= val;
279 1.6 dyoung } else if (state != LLADDR_S_INITIAL && state != LLADDR_S_COLON)
280 1.6 dyoung return -1;
281 1.6 dyoung else {
282 1.6 dyoung state = LLADDR_S_ONE_OCTET;
283 1.6 dyoung octet = val;
284 1.6 dyoung }
285 1.7 dyoung dbg_warnx("%s.%d", __func__, __LINE__);
286 1.6 dyoung }
287 1.6 dyoung return -1;
288 1.6 dyoung }
289 1.6 dyoung
290 1.6 dyoung static int
291 1.1 dyoung paddr_match(const struct parser *p, const struct match *im, struct match *om,
292 1.1 dyoung int argidx, const char *arg0)
293 1.1 dyoung {
294 1.1 dyoung unsigned int net, node;
295 1.1 dyoung int nread;
296 1.1 dyoung union {
297 1.1 dyoung struct sockaddr sa;
298 1.1 dyoung struct sockaddr_at sat;
299 1.1 dyoung struct sockaddr_iso siso;
300 1.1 dyoung struct sockaddr_in sin;
301 1.6 dyoung struct sockaddr_storage ss;
302 1.1 dyoung } u;
303 1.1 dyoung const struct paddr *pa = (const struct paddr *)p;
304 1.1 dyoung prop_data_t d;
305 1.1 dyoung prop_object_t o;
306 1.3 dyoung int64_t af0;
307 1.1 dyoung int af, rc;
308 1.1 dyoung struct paddr_prefix *pfx, *mask;
309 1.1 dyoung const struct sockaddr *sa = NULL;
310 1.1 dyoung struct addrinfo hints, *result = NULL;
311 1.1 dyoung char *arg, *end, *plen = NULL, *servname0;
312 1.1 dyoung const char *servname;
313 1.4 dyoung long prefixlen = -1;
314 1.1 dyoung size_t len;
315 1.1 dyoung
316 1.5 dyoung if (arg0 == NULL) {
317 1.5 dyoung errno = EINVAL;
318 1.1 dyoung return -1;
319 1.5 dyoung }
320 1.1 dyoung
321 1.1 dyoung if (pa->pa_activator != NULL &&
322 1.1 dyoung prop_dictionary_get(im->m_env, pa->pa_activator) == NULL)
323 1.1 dyoung return -1;
324 1.1 dyoung
325 1.1 dyoung if (pa->pa_deactivator != NULL &&
326 1.1 dyoung prop_dictionary_get(im->m_env, pa->pa_deactivator) != NULL)
327 1.1 dyoung return -1;
328 1.1 dyoung
329 1.3 dyoung if (!prop_dictionary_get_int64(im->m_env, "af", &af0))
330 1.3 dyoung af = AF_UNSPEC;
331 1.3 dyoung else
332 1.3 dyoung af = af0;
333 1.1 dyoung
334 1.1 dyoung switch (af) {
335 1.1 dyoung case AF_UNSPEC:
336 1.1 dyoung case AF_INET:
337 1.1 dyoung case AF_INET6:
338 1.1 dyoung if ((arg = strdup(arg0)) == NULL)
339 1.1 dyoung return -1;
340 1.1 dyoung
341 1.1 dyoung servname0 = arg;
342 1.1 dyoung (void)strsep(&servname0, ",");
343 1.1 dyoung servname = (servname0 == NULL) ? "0" : servname0;
344 1.1 dyoung
345 1.1 dyoung if (pa->pa_maskkey == NULL)
346 1.1 dyoung ;
347 1.1 dyoung else if ((plen = strrchr(arg, '/')) != NULL)
348 1.1 dyoung *plen++ = '\0';
349 1.1 dyoung
350 1.1 dyoung memset(&u, 0, sizeof(u));
351 1.1 dyoung
352 1.1 dyoung memset(&hints, 0, sizeof(hints));
353 1.1 dyoung
354 1.1 dyoung hints.ai_flags = AI_NUMERICHOST | AI_PASSIVE;
355 1.1 dyoung hints.ai_family = af;
356 1.1 dyoung hints.ai_socktype = SOCK_DGRAM;
357 1.1 dyoung
358 1.1 dyoung for (;;) {
359 1.1 dyoung rc = getaddrinfo(arg, servname, &hints, &result);
360 1.1 dyoung if (rc == 0) {
361 1.1 dyoung if (result->ai_next == NULL)
362 1.1 dyoung sa = result->ai_addr;
363 1.1 dyoung else
364 1.1 dyoung errno = EMLINK;
365 1.1 dyoung break;
366 1.1 dyoung } else if ((hints.ai_flags & AI_NUMERICHOST) != 0 &&
367 1.1 dyoung (af == AF_INET || af == AF_UNSPEC) &&
368 1.1 dyoung inet_aton(arg, &u.sin.sin_addr) == 1) {
369 1.1 dyoung u.sin.sin_family = AF_INET;
370 1.1 dyoung u.sin.sin_len = sizeof(u.sin);
371 1.1 dyoung sa = &u.sa;
372 1.1 dyoung break;
373 1.1 dyoung } else if ((hints.ai_flags & AI_NUMERICHOST) == 0 ||
374 1.1 dyoung rc != EAI_NONAME) {
375 1.1 dyoung errno = ENOENT;
376 1.1 dyoung break;
377 1.1 dyoung }
378 1.1 dyoung hints.ai_flags &= ~AI_NUMERICHOST;
379 1.1 dyoung }
380 1.1 dyoung
381 1.1 dyoung
382 1.1 dyoung if (plen == NULL)
383 1.4 dyoung prefixlen = -1;
384 1.1 dyoung else {
385 1.1 dyoung prefixlen = strtol(plen, &end, 10);
386 1.1 dyoung if (end != NULL && *end != '\0')
387 1.1 dyoung sa = NULL;
388 1.4 dyoung if (prefixlen < 0 || prefixlen >= UINT8_MAX) {
389 1.4 dyoung errno = ERANGE;
390 1.4 dyoung sa = NULL;
391 1.4 dyoung }
392 1.1 dyoung }
393 1.1 dyoung
394 1.1 dyoung free(arg);
395 1.1 dyoung if (sa != NULL || af != AF_UNSPEC)
396 1.1 dyoung break;
397 1.1 dyoung /*FALLTHROUGH*/
398 1.1 dyoung case AF_APPLETALK:
399 1.1 dyoung if (sscanf(arg0, "%u.%u%n", &net, &node, &nread) == 2 &&
400 1.1 dyoung net != 0 && net <= 0xffff && node != 0 && node <= 0xfe &&
401 1.1 dyoung arg0[nread] == '\0') {
402 1.1 dyoung u.sat.sat_family = AF_APPLETALK;
403 1.1 dyoung u.sat.sat_len = sizeof(u.sat);
404 1.1 dyoung u.sat.sat_addr.s_net = htons(net);
405 1.1 dyoung u.sat.sat_addr.s_node = node;
406 1.1 dyoung sa = &u.sa;
407 1.1 dyoung }
408 1.8 dyoung break;
409 1.1 dyoung case AF_ISO:
410 1.1 dyoung u.siso.siso_len = sizeof(u.siso);
411 1.1 dyoung u.siso.siso_family = AF_ISO;
412 1.1 dyoung /* XXX iso_addr(3) matches ANYTHING! */
413 1.1 dyoung u.siso.siso_addr = *iso_addr(arg0);
414 1.1 dyoung sa = &u.sa;
415 1.1 dyoung break;
416 1.6 dyoung case AF_LINK:
417 1.6 dyoung if (parse_linkaddr(arg0, &u.ss) == -1)
418 1.6 dyoung sa = NULL;
419 1.6 dyoung else
420 1.6 dyoung sa = &u.sa;
421 1.6 dyoung break;
422 1.1 dyoung }
423 1.1 dyoung
424 1.1 dyoung if (sa == NULL)
425 1.1 dyoung return -1;
426 1.1 dyoung
427 1.1 dyoung len = offsetof(struct paddr_prefix, pfx_addr) + sa->sa_len;
428 1.1 dyoung
429 1.1 dyoung if ((pfx = malloc(len)) == NULL)
430 1.1 dyoung return -1;
431 1.1 dyoung
432 1.1 dyoung #if 0
433 1.1 dyoung {
434 1.1 dyoung int i;
435 1.1 dyoung
436 1.1 dyoung for (i = 0; i < sa->sa_len; i++)
437 1.1 dyoung printf(" %02x", ((const uint8_t *)sa)[i]);
438 1.1 dyoung printf("\n");
439 1.1 dyoung }
440 1.1 dyoung #endif
441 1.1 dyoung
442 1.4 dyoung pfx->pfx_len = (int16_t)prefixlen;
443 1.1 dyoung memcpy(&pfx->pfx_addr, sa, sa->sa_len);
444 1.1 dyoung af = sa->sa_family;
445 1.1 dyoung
446 1.1 dyoung if (result != NULL)
447 1.1 dyoung freeaddrinfo(result);
448 1.1 dyoung
449 1.1 dyoung o = (prop_object_t)prop_data_create_data(pfx, len);
450 1.1 dyoung
451 1.1 dyoung free(pfx);
452 1.1 dyoung
453 1.1 dyoung if (o == NULL)
454 1.1 dyoung return -1;
455 1.1 dyoung
456 1.1 dyoung if (match_setenv(im, om, pa->pa_addrkey, o) == -1)
457 1.1 dyoung return -1;
458 1.1 dyoung
459 1.1 dyoung if (pa->pa_maskkey != NULL && plen != NULL) {
460 1.1 dyoung size_t masklen;
461 1.1 dyoung
462 1.1 dyoung if ((mask = prefixlen_to_mask(af, prefixlen)) == NULL) {
463 1.1 dyoung err(EXIT_FAILURE, "%s: prefixlen_to_mask(%d, %ld)",
464 1.1 dyoung __func__, af, prefixlen);
465 1.1 dyoung return -1;
466 1.1 dyoung }
467 1.1 dyoung
468 1.1 dyoung masklen = offsetof(struct paddr_prefix, pfx_addr) +
469 1.1 dyoung mask->pfx_addr.sa_len;
470 1.1 dyoung
471 1.1 dyoung d = prop_data_create_data(mask, masklen);
472 1.1 dyoung free(mask);
473 1.1 dyoung
474 1.1 dyoung if (d == NULL) {
475 1.1 dyoung err(EXIT_FAILURE, "%s: prop_data_create_data",
476 1.1 dyoung __func__);
477 1.1 dyoung return -1;
478 1.1 dyoung }
479 1.1 dyoung
480 1.1 dyoung rc = prop_dictionary_set(om->m_env, pa->pa_maskkey,
481 1.1 dyoung (prop_object_t)d) ? 0 : -1;
482 1.1 dyoung
483 1.1 dyoung prop_object_release((prop_object_t)d);
484 1.1 dyoung
485 1.1 dyoung if (rc != 0) {
486 1.1 dyoung err(EXIT_FAILURE, "%s: prop_dictionary_set", __func__);
487 1.1 dyoung return rc;
488 1.1 dyoung }
489 1.1 dyoung }
490 1.1 dyoung
491 1.1 dyoung om->m_argidx = argidx;
492 1.1 dyoung om->m_parser = p;
493 1.1 dyoung om->m_nextparser = p->p_nextparser;
494 1.1 dyoung return 0;
495 1.1 dyoung }
496 1.1 dyoung
497 1.1 dyoung static int
498 1.1 dyoung pterm_match(const struct parser *p, const struct match *im,
499 1.1 dyoung struct match *om, int argidx, const char *arg)
500 1.1 dyoung {
501 1.1 dyoung const struct pterm *pt = (const struct pterm *)p;
502 1.1 dyoung prop_bool_t b;
503 1.1 dyoung
504 1.1 dyoung if (arg != NULL) {
505 1.1 dyoung errno = EINVAL;
506 1.1 dyoung return -1;
507 1.1 dyoung }
508 1.1 dyoung b = prop_bool_create(true);
509 1.1 dyoung
510 1.1 dyoung if (match_setenv(im, om, pt->pt_key, (prop_object_t)b) == -1)
511 1.1 dyoung return -1;
512 1.1 dyoung
513 1.1 dyoung om->m_argidx = argidx;
514 1.1 dyoung om->m_parser = p;
515 1.1 dyoung om->m_nextparser = NULL;
516 1.1 dyoung return 0;
517 1.1 dyoung }
518 1.1 dyoung
519 1.1 dyoung static int
520 1.1 dyoung piface_match(const struct parser *p, const struct match *im,
521 1.1 dyoung struct match *om, int argidx, const char *arg)
522 1.1 dyoung {
523 1.1 dyoung const struct piface *pif = (const struct piface *)p;
524 1.1 dyoung prop_object_t o;
525 1.1 dyoung
526 1.1 dyoung if (arg == NULL || strlen(arg) > IFNAMSIZ) {
527 1.1 dyoung errno = EINVAL;
528 1.1 dyoung return -1;
529 1.1 dyoung }
530 1.1 dyoung
531 1.1 dyoung if ((o = (prop_object_t)prop_string_create_cstring(arg)) == NULL) {
532 1.1 dyoung errno = ENOMEM;
533 1.1 dyoung return -1;
534 1.1 dyoung }
535 1.1 dyoung
536 1.1 dyoung if (match_setenv(im, om, pif->pif_key, o) == -1)
537 1.1 dyoung return -1;
538 1.1 dyoung
539 1.1 dyoung om->m_argidx = argidx;
540 1.1 dyoung om->m_parser = p;
541 1.1 dyoung om->m_nextparser = p->p_nextparser;
542 1.1 dyoung return 0;
543 1.1 dyoung }
544 1.1 dyoung
545 1.1 dyoung static void
546 1.1 dyoung match_cleanup(struct match *dst)
547 1.1 dyoung {
548 1.1 dyoung if (dst->m_env != NULL)
549 1.1 dyoung prop_object_release((prop_object_t)dst->m_env);
550 1.1 dyoung memset(dst, 0, sizeof(*dst));
551 1.1 dyoung }
552 1.1 dyoung
553 1.1 dyoung static void
554 1.1 dyoung match_copy(struct match *dst, const struct match *src)
555 1.1 dyoung {
556 1.1 dyoung match_cleanup(dst);
557 1.1 dyoung
558 1.1 dyoung prop_object_retain((prop_object_t)src->m_env);
559 1.1 dyoung *dst = *src;
560 1.1 dyoung }
561 1.1 dyoung
562 1.1 dyoung static int
563 1.1 dyoung pbranch_match(const struct parser *p, const struct match *im,
564 1.1 dyoung struct match *om, int argidx, const char *arg)
565 1.1 dyoung {
566 1.1 dyoung const struct parser *nextp;
567 1.1 dyoung struct branch *b;
568 1.1 dyoung const struct pbranch *pb = (const struct pbranch *)p;
569 1.1 dyoung struct match tmpm;
570 1.1 dyoung int nforbid = 0, nmatch = 0, rc;
571 1.1 dyoung parser_match_t matchfunc;
572 1.1 dyoung
573 1.1 dyoung memset(&tmpm, 0, sizeof(tmpm));
574 1.1 dyoung
575 1.1 dyoung SIMPLEQ_FOREACH(b, &pb->pb_branches, b_next) {
576 1.1 dyoung dbg_warnx("%s: b->b_nextparser %p", __func__,
577 1.1 dyoung (const void *)b->b_nextparser);
578 1.1 dyoung nextp = b->b_nextparser;
579 1.1 dyoung if (nextp == NULL) {
580 1.1 dyoung if (arg == NULL) {
581 1.1 dyoung nmatch++;
582 1.1 dyoung match_setenv(im, om, NULL, NULL);
583 1.1 dyoung om->m_nextparser = NULL;
584 1.1 dyoung om->m_parser = p;
585 1.1 dyoung om->m_argidx = argidx;
586 1.1 dyoung }
587 1.1 dyoung continue;
588 1.1 dyoung }
589 1.1 dyoung matchfunc = nextp->p_methods->pm_match;
590 1.1 dyoung rc = (*matchfunc)(nextp, im, &tmpm, argidx, arg);
591 1.1 dyoung if (rc == 0) {
592 1.1 dyoung match_copy(om, &tmpm);
593 1.1 dyoung match_cleanup(&tmpm);
594 1.1 dyoung nmatch++;
595 1.1 dyoung dbg_warnx("%s: branch %s ok", __func__, nextp->p_name);
596 1.1 dyoung if (pb->pb_match_first)
597 1.1 dyoung break;
598 1.1 dyoung } else if (rc == 1) {
599 1.1 dyoung nforbid++;
600 1.1 dyoung if (pb->pb_match_first)
601 1.1 dyoung break;
602 1.1 dyoung } else {
603 1.1 dyoung dbg_warnx("%s: fail branch %s", __func__,
604 1.1 dyoung nextp->p_name);
605 1.1 dyoung }
606 1.1 dyoung }
607 1.1 dyoung switch (nmatch) {
608 1.1 dyoung case 0:
609 1.1 dyoung errno = ENOENT;
610 1.1 dyoung return (nforbid == 0) ? -1 : 1;
611 1.1 dyoung case 1:
612 1.1 dyoung dbg_warnx("%s: branch ok", __func__);
613 1.1 dyoung return 0;
614 1.1 dyoung default:
615 1.1 dyoung match_cleanup(om);
616 1.1 dyoung errno = EMLINK;
617 1.1 dyoung return -1;
618 1.1 dyoung }
619 1.1 dyoung }
620 1.1 dyoung
621 1.1 dyoung static int
622 1.1 dyoung pkw_match(const struct parser *p, const struct match *im,
623 1.1 dyoung struct match *om, int argidx, const char *arg)
624 1.1 dyoung {
625 1.1 dyoung prop_object_t o = NULL;
626 1.1 dyoung struct kwinst *k;
627 1.1 dyoung union kwval *u = NULL;
628 1.1 dyoung const struct pkw *pk = (const struct pkw *)p;
629 1.1 dyoung
630 1.1 dyoung if (arg == NULL) {
631 1.1 dyoung errno = EINVAL;
632 1.1 dyoung return -1;
633 1.1 dyoung }
634 1.1 dyoung
635 1.1 dyoung SIMPLEQ_FOREACH(k, &pk->pk_keywords, k_next) {
636 1.1 dyoung if (k->k_act != NULL &&
637 1.1 dyoung prop_dictionary_get(im->m_env, k->k_act) == NULL)
638 1.1 dyoung continue;
639 1.1 dyoung
640 1.1 dyoung if (k->k_neg && arg[0] == '-' &&
641 1.1 dyoung strcmp(k->k_word, arg + 1) == 0)
642 1.1 dyoung u = &k->k_negu;
643 1.1 dyoung else if (strcmp(k->k_word, arg) == 0)
644 1.1 dyoung u = &k->k_u;
645 1.1 dyoung else
646 1.1 dyoung continue;
647 1.1 dyoung
648 1.1 dyoung if (k->k_altdeact != NULL &&
649 1.1 dyoung prop_dictionary_get(im->m_env, k->k_altdeact) != NULL)
650 1.1 dyoung return 1;
651 1.1 dyoung
652 1.1 dyoung if (k->k_deact != NULL &&
653 1.1 dyoung prop_dictionary_get(im->m_env, k->k_deact) != NULL)
654 1.1 dyoung return 1;
655 1.1 dyoung break;
656 1.1 dyoung }
657 1.1 dyoung if (k == NULL) {
658 1.1 dyoung errno = ENOENT;
659 1.1 dyoung return -1;
660 1.1 dyoung }
661 1.1 dyoung switch (k->k_type) {
662 1.1 dyoung case KW_T_NONE:
663 1.1 dyoung break;
664 1.1 dyoung case KW_T_BOOL:
665 1.1 dyoung o = (prop_object_t)prop_bool_create(u->u_bool);
666 1.1 dyoung if (o == NULL)
667 1.1 dyoung goto err;
668 1.1 dyoung break;
669 1.8 dyoung case KW_T_INT:
670 1.8 dyoung o = (prop_object_t)prop_number_create_integer(u->u_sint);
671 1.8 dyoung if (o == NULL)
672 1.8 dyoung goto err;
673 1.8 dyoung break;
674 1.8 dyoung case KW_T_UINT:
675 1.8 dyoung o = (prop_object_t)prop_number_create_unsigned_integer(
676 1.8 dyoung u->u_uint);
677 1.1 dyoung if (o == NULL)
678 1.1 dyoung goto err;
679 1.1 dyoung break;
680 1.1 dyoung case KW_T_OBJ:
681 1.1 dyoung o = u->u_obj;
682 1.1 dyoung break;
683 1.1 dyoung case KW_T_STR:
684 1.1 dyoung o = (prop_object_t)prop_data_create_data_nocopy(u->u_str,
685 1.1 dyoung strlen(u->u_str));
686 1.1 dyoung if (o == NULL)
687 1.1 dyoung goto err;
688 1.1 dyoung break;
689 1.1 dyoung default:
690 1.1 dyoung errx(EXIT_FAILURE, "unknown keyword type %d", k->k_type);
691 1.1 dyoung }
692 1.1 dyoung
693 1.1 dyoung if (match_setenv(im, om, (o == NULL) ? NULL : k->k_key, o) == -1)
694 1.1 dyoung return -1;
695 1.1 dyoung
696 1.1 dyoung om->m_argidx = argidx;
697 1.1 dyoung om->m_parser = p;
698 1.1 dyoung om->m_nextparser = k->k_nextparser;
699 1.1 dyoung om->m_exec = k->k_exec;
700 1.1 dyoung return 0;
701 1.1 dyoung err:
702 1.1 dyoung errno = ENOMEM;
703 1.1 dyoung return -1;
704 1.1 dyoung }
705 1.1 dyoung
706 1.1 dyoung struct paddr *
707 1.1 dyoung paddr_create(const char *name, parser_exec_t pexec, const char *addrkey,
708 1.1 dyoung const char *maskkey, struct parser *next)
709 1.1 dyoung {
710 1.1 dyoung struct paddr *pa;
711 1.1 dyoung
712 1.1 dyoung if ((pa = calloc(sizeof(*pa), 1)) == NULL)
713 1.1 dyoung return NULL;
714 1.1 dyoung
715 1.1 dyoung pa->pa_parser.p_methods = &paddr_methods;
716 1.1 dyoung pa->pa_parser.p_exec = pexec;
717 1.1 dyoung pa->pa_parser.p_name = name;
718 1.1 dyoung pa->pa_parser.p_nextparser = next;
719 1.1 dyoung
720 1.1 dyoung pa->pa_addrkey = addrkey;
721 1.1 dyoung pa->pa_maskkey = maskkey;
722 1.1 dyoung
723 1.1 dyoung return pa;
724 1.1 dyoung }
725 1.1 dyoung
726 1.1 dyoung struct piface *
727 1.1 dyoung piface_create(const char *name, parser_exec_t pexec, const char *defkey,
728 1.1 dyoung struct parser *defnext)
729 1.1 dyoung {
730 1.1 dyoung struct piface *pif;
731 1.1 dyoung
732 1.1 dyoung if ((pif = calloc(sizeof(*pif), 1)) == NULL)
733 1.1 dyoung return NULL;
734 1.1 dyoung
735 1.1 dyoung pif->pif_parser.p_methods = &piface_methods;
736 1.1 dyoung pif->pif_parser.p_exec = pexec;
737 1.1 dyoung pif->pif_parser.p_name = name;
738 1.1 dyoung pif->pif_parser.p_nextparser = defnext;
739 1.1 dyoung
740 1.1 dyoung pif->pif_key = defkey;
741 1.1 dyoung
742 1.1 dyoung return pif;
743 1.1 dyoung }
744 1.1 dyoung
745 1.1 dyoung int
746 1.1 dyoung pbranch_setbranches(struct pbranch *pb, const struct branch *brs, size_t nbr)
747 1.1 dyoung {
748 1.1 dyoung struct branch *b;
749 1.1 dyoung int i;
750 1.1 dyoung
751 1.1 dyoung dbg_warnx("%s: nbr %zu", __func__, nbr);
752 1.1 dyoung
753 1.1 dyoung while ((b = SIMPLEQ_FIRST(&pb->pb_branches)) != NULL) {
754 1.1 dyoung SIMPLEQ_REMOVE_HEAD(&pb->pb_branches, b_next);
755 1.1 dyoung free(b);
756 1.1 dyoung }
757 1.1 dyoung
758 1.1 dyoung for (i = 0; i < nbr; i++) {
759 1.1 dyoung if ((b = malloc(sizeof(*b))) == NULL)
760 1.1 dyoung goto err;
761 1.1 dyoung *b = brs[i];
762 1.1 dyoung dbg_warnx("%s: b->b_nextparser %p", __func__,
763 1.1 dyoung (const void *)b->b_nextparser);
764 1.1 dyoung SIMPLEQ_INSERT_TAIL(&pb->pb_branches, b, b_next);
765 1.1 dyoung }
766 1.1 dyoung
767 1.1 dyoung return 0;
768 1.1 dyoung err:
769 1.1 dyoung while ((b = SIMPLEQ_FIRST(&pb->pb_branches)) != NULL) {
770 1.1 dyoung SIMPLEQ_REMOVE_HEAD(&pb->pb_branches, b_next);
771 1.1 dyoung free(b);
772 1.1 dyoung }
773 1.1 dyoung return -1;
774 1.1 dyoung }
775 1.1 dyoung
776 1.1 dyoung static int
777 1.1 dyoung pbranch_init(struct parser *p)
778 1.1 dyoung {
779 1.1 dyoung struct branch *b;
780 1.1 dyoung struct pbranch *pb = (struct pbranch *)p;
781 1.1 dyoung struct parser *np;
782 1.1 dyoung
783 1.1 dyoung if (pb->pb_nbrinit == 0 || !SIMPLEQ_EMPTY(&pb->pb_branches))
784 1.1 dyoung return 0;
785 1.1 dyoung
786 1.1 dyoung if (pbranch_setbranches(pb, pb->pb_brinit, pb->pb_nbrinit) == -1)
787 1.1 dyoung return -1;
788 1.1 dyoung
789 1.1 dyoung SIMPLEQ_FOREACH(b, &pb->pb_branches, b_next) {
790 1.1 dyoung np = b->b_nextparser;
791 1.1 dyoung if (np != NULL && parser_init(np) == -1)
792 1.1 dyoung return -1;
793 1.1 dyoung }
794 1.1 dyoung return 0;
795 1.1 dyoung }
796 1.1 dyoung
797 1.1 dyoung struct pbranch *
798 1.1 dyoung pbranch_create(const char *name, const struct branch *brs, size_t nbr,
799 1.1 dyoung bool match_first)
800 1.1 dyoung {
801 1.1 dyoung struct pbranch *pb;
802 1.1 dyoung
803 1.1 dyoung dbg_warnx("%s: nbr %zu", __func__, nbr);
804 1.1 dyoung
805 1.1 dyoung if ((pb = calloc(1, sizeof(*pb))) == NULL)
806 1.1 dyoung return NULL;
807 1.1 dyoung
808 1.1 dyoung pb->pb_parser.p_methods = &pbranch_methods;
809 1.1 dyoung pb->pb_parser.p_name = name;
810 1.1 dyoung
811 1.1 dyoung SIMPLEQ_INIT(&pb->pb_branches);
812 1.1 dyoung
813 1.1 dyoung if (pbranch_setbranches(pb, brs, nbr) == -1)
814 1.1 dyoung goto post_pb_err;
815 1.1 dyoung
816 1.1 dyoung pb->pb_match_first = match_first;
817 1.1 dyoung return pb;
818 1.1 dyoung post_pb_err:
819 1.1 dyoung free(pb);
820 1.1 dyoung return NULL;
821 1.1 dyoung }
822 1.1 dyoung
823 1.1 dyoung static int
824 1.1 dyoung parser_default_init(struct parser *p)
825 1.1 dyoung {
826 1.1 dyoung struct parser *np;
827 1.1 dyoung
828 1.1 dyoung np = p->p_nextparser;
829 1.1 dyoung if (np != NULL && parser_init(np) == -1)
830 1.1 dyoung return -1;
831 1.1 dyoung
832 1.1 dyoung return 0;
833 1.1 dyoung }
834 1.1 dyoung
835 1.1 dyoung static int
836 1.1 dyoung pkw_setwords(struct pkw *pk, parser_exec_t defexec, const char *defkey,
837 1.1 dyoung const struct kwinst *kws, size_t nkw, struct parser *defnext)
838 1.1 dyoung {
839 1.1 dyoung struct kwinst *k;
840 1.1 dyoung int i;
841 1.1 dyoung
842 1.1 dyoung for (i = 0; i < nkw; i++) {
843 1.1 dyoung if ((k = malloc(sizeof(*k))) == NULL)
844 1.1 dyoung goto post_pk_err;
845 1.1 dyoung *k = kws[i];
846 1.1 dyoung if (k->k_nextparser == NULL)
847 1.1 dyoung k->k_nextparser = defnext;
848 1.1 dyoung if (k->k_key == NULL)
849 1.1 dyoung k->k_key = defkey;
850 1.1 dyoung if (k->k_exec == NULL)
851 1.1 dyoung k->k_exec = defexec;
852 1.1 dyoung SIMPLEQ_INSERT_TAIL(&pk->pk_keywords, k, k_next);
853 1.1 dyoung }
854 1.1 dyoung return 0;
855 1.1 dyoung
856 1.1 dyoung post_pk_err:
857 1.1 dyoung while ((k = SIMPLEQ_FIRST(&pk->pk_keywords)) != NULL) {
858 1.1 dyoung SIMPLEQ_REMOVE_HEAD(&pk->pk_keywords, k_next);
859 1.1 dyoung free(k);
860 1.1 dyoung }
861 1.1 dyoung return -1;
862 1.1 dyoung }
863 1.1 dyoung
864 1.1 dyoung static int
865 1.1 dyoung pkw_init(struct parser *p)
866 1.1 dyoung {
867 1.1 dyoung struct kwinst *k;
868 1.1 dyoung struct pkw *pk = (struct pkw *)p;
869 1.1 dyoung struct parser *np;
870 1.1 dyoung
871 1.1 dyoung if (pk->pk_nkwinit == 0 || !SIMPLEQ_EMPTY(&pk->pk_keywords))
872 1.1 dyoung return 0;
873 1.1 dyoung if (pkw_setwords(pk, pk->pk_execinit, pk->pk_keyinit, pk->pk_kwinit,
874 1.1 dyoung pk->pk_nkwinit, pk->pk_nextinit) == -1)
875 1.1 dyoung return -1;
876 1.1 dyoung SIMPLEQ_FOREACH(k, &pk->pk_keywords, k_next) {
877 1.1 dyoung np = k->k_nextparser;
878 1.1 dyoung if (np != NULL && parser_init(np) == -1)
879 1.1 dyoung return -1;
880 1.1 dyoung }
881 1.1 dyoung return 0;
882 1.1 dyoung }
883 1.1 dyoung
884 1.1 dyoung struct pkw *
885 1.1 dyoung pkw_create(const char *name, parser_exec_t defexec, const char *defkey,
886 1.1 dyoung const struct kwinst *kws, size_t nkw, struct parser *defnext)
887 1.1 dyoung {
888 1.1 dyoung struct pkw *pk;
889 1.1 dyoung
890 1.1 dyoung if ((pk = calloc(1, sizeof(*pk))) == NULL)
891 1.1 dyoung return NULL;
892 1.1 dyoung
893 1.1 dyoung pk->pk_parser.p_methods = &pkw_methods;
894 1.1 dyoung pk->pk_parser.p_exec = defexec;
895 1.1 dyoung pk->pk_parser.p_name = name;
896 1.1 dyoung
897 1.1 dyoung SIMPLEQ_INIT(&pk->pk_keywords);
898 1.1 dyoung
899 1.1 dyoung if (pkw_setwords(pk, defexec, defkey, kws, nkw, defnext) == -1)
900 1.1 dyoung goto err;
901 1.1 dyoung
902 1.1 dyoung return pk;
903 1.1 dyoung err:
904 1.1 dyoung free(pk);
905 1.1 dyoung return NULL;
906 1.1 dyoung }
907 1.1 dyoung
908 1.1 dyoung int
909 1.1 dyoung parse(int argc, char **argv, const struct parser *p0, struct match *matches,
910 1.1 dyoung size_t *nmatch, int *narg)
911 1.1 dyoung {
912 1.1 dyoung int i, rc = 0;
913 1.1 dyoung struct match *lastm = NULL, *m = matches;
914 1.1 dyoung const struct parser *p = p0;
915 1.1 dyoung
916 1.1 dyoung for (i = 0; i < argc && p != NULL; i++) {
917 1.1 dyoung if (m - matches >= *nmatch) {
918 1.1 dyoung errno = EFBIG;
919 1.1 dyoung rc = -1;
920 1.1 dyoung break;
921 1.1 dyoung }
922 1.1 dyoung rc = (*p->p_methods->pm_match)(p, lastm, m, i, argv[i]);
923 1.1 dyoung if (rc != 0)
924 1.1 dyoung goto out;
925 1.1 dyoung p = m->m_nextparser;
926 1.1 dyoung lastm = m++;
927 1.1 dyoung }
928 1.1 dyoung for (; m - matches < *nmatch && p != NULL; ) {
929 1.1 dyoung rc = (*p->p_methods->pm_match)(p, lastm, m, i, NULL);
930 1.1 dyoung if (rc != 0)
931 1.1 dyoung break;
932 1.1 dyoung p = m->m_nextparser;
933 1.1 dyoung lastm = m++;
934 1.1 dyoung }
935 1.1 dyoung out:
936 1.1 dyoung *nmatch = m - matches;
937 1.1 dyoung *narg = i;
938 1.1 dyoung return rc;
939 1.1 dyoung }
940 1.1 dyoung
941 1.1 dyoung int
942 1.1 dyoung matches_exec(const struct match *matches, prop_dictionary_t xenv, size_t nmatch)
943 1.1 dyoung {
944 1.1 dyoung int i, rc = 0;
945 1.1 dyoung const struct match *m;
946 1.1 dyoung parser_exec_t pexec;
947 1.1 dyoung prop_dictionary_t d;
948 1.1 dyoung
949 1.1 dyoung for (i = 0; i < nmatch; i++) {
950 1.1 dyoung m = &matches[i];
951 1.1 dyoung dbg_warnx("%s.%d: i %d", __func__, __LINE__, i);
952 1.1 dyoung pexec = (m->m_parser->p_exec != NULL)
953 1.1 dyoung ? m->m_parser->p_exec : m->m_exec;
954 1.1 dyoung if (pexec == NULL)
955 1.1 dyoung continue;
956 1.1 dyoung dbg_warnx("%s.%d: m->m_parser->p_name %s", __func__, __LINE__,
957 1.1 dyoung m->m_parser->p_name);
958 1.1 dyoung d = prop_dictionary_augment(m->m_env, xenv);
959 1.1 dyoung rc = (*pexec)(d, xenv);
960 1.1 dyoung prop_object_release((prop_object_t)d);
961 1.1 dyoung if (rc == -1)
962 1.1 dyoung break;
963 1.1 dyoung }
964 1.1 dyoung return rc;
965 1.1 dyoung }
966