psyc-mirrors
/
psyced
mirror of git://git.psyced.org/git/psyced
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

spyc/dispatch: fix for udp

This commit is contained in:
Gabor Adam Toth 2011-05-23 02:47:23 +02:00
parent c4a915e82f
commit 7de29d90e1
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
world/net/spyc/dispatch.i
View File

@ -1,19 +1,19 @@
// included by TCP circuit *and* UDP daemon // vim:syntax=lpc // included by TCP circuit *and* UDP daemon // vim:syntax=lpc
volatile mapping routing = shared_memory("routing");
// processes routing header variable assignments // processes routing header variable assignments
// basic version does no state // basic version does no state
mixed process_routing_modifiers(mapping rvars, mapping vars) { mixed process_routing_modifiers(mapping rvars, mapping vars) {
if (!mappingp(instate)) // no routing state for udp
return;
foreach (mixed vname : m_indices(rvars)) { foreach (mixed vname : m_indices(rvars)) {
if (!isRouting[vname]) { if (!routing[vname]) {
CIRCUITERROR("illegal varname in routing header") DISPATCHERROR("illegal varname in routing header")
} }
switch (rvars[vname, 1]) { switch (rvars[vname, 1]) {
case C_GLYPH_MODIFIER_ASSIGN: case C_GLYPH_MODIFIER_ASSIGN:
// TODO: delete if empty? // TODO: delete if empty?
if (mappingp(instate))
instate[vname] = rvars[vname]; instate[vname] = rvars[vname];
// fall thru // fall thru
case C_GLYPH_MODIFIER_SET: case C_GLYPH_MODIFIER_SET:
@ -22,14 +22,15 @@ mixed process_routing_modifiers(mapping rvars, mapping vars) {
case C_GLYPH_MODIFIER_AUGMENT: case C_GLYPH_MODIFIER_AUGMENT:
case C_GLYPH_MODIFIER_DIMINISH: case C_GLYPH_MODIFIER_DIMINISH:
case C_GLYPH_MODIFIER_QUERY: case C_GLYPH_MODIFIER_QUERY:
CIRCUITERROR("header modifier with glyph other than ':' or '=', this is not implemented") DISPATCHERROR("header modifier with glyph other than ':' or '=', this is not implemented")
break; break;
default: default:
CIRCUITERROR("header modifier with unknown glyph") DISPATCHERROR("header modifier with unknown glyph")
break; break;
} }
} }
if (mappingp(instate))
vars += instate; vars += instate;
return 1; return 1;
} }
@ -37,7 +38,7 @@ mixed process_routing_modifiers(mapping rvars, mapping vars) {
mixed process_entity_modifiers(mapping evars, mapping vars, mapping cstate) { mixed process_entity_modifiers(mapping evars, mapping vars, mapping cstate) {
// apply evars to context state // apply evars to context state
foreach (mixed vname : m_indices(evars)) { foreach (mixed vname : m_indices(evars)) {
if (isRouting[vname] || abbrev("_INTERNAL", vname) if (routing[vname] || abbrev("_INTERNAL", vname)
#ifndef LIBPSYC #ifndef LIBPSYC
|| !legal_keyword(vname) || !legal_keyword(vname)
#endif #endif