Changeset 404 for branches/merlin
- Timestamp:
- 09/04/09 16:08:59 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/merlin/src/chk.c
r395 r404 40 40 if (!client[idx].sidtabok) { 41 41 if (!client[idx].sidtabno) 42 return (1);42 return 1; 43 43 rc = 1; 44 44 } … … 46 46 if (sidtab->num_caid | sidtab->num_provid | sidtab->num_srvid) { 47 47 if ((client[idx].sidtabno & (1 << nr)) && (chk_srvid_match(er, sidtab))) 48 return (0);48 return 0; 49 49 if ((client[idx].sidtabok & (1 << nr)) && (chk_srvid_match(er, sidtab))) 50 50 rc = 1; 51 51 } 52 return (rc);52 return rc; 53 53 } 54 54 … … 61 61 62 62 if (!ptab) 63 return (1);63 return 1; 64 64 65 65 caid = er->caid; … … 85 85 if (!er->rcEx) 86 86 er->rcEx = (E1_LSERVER << 4) | E2_IDENT; 87 return (rc);88 } 89 } 90 return (rc);87 return rc; 88 } 89 } 90 return rc; 91 91 } 92 92 … … 115 115 log_debug("no match, %04X:%04X rejected by %s '%s' CHID filter(s)", er->caid, er->chid, type, name); 116 116 117 return (rc);117 return rc; 118 118 } 119 119 … … 145 145 if (!er->rcEx) 146 146 er->rcEx = (E1_USER << 4) | E2_IDENT; 147 return (rc);147 return rc; 148 148 } 149 149 } … … 196 196 } 197 197 198 return (rc);198 return rc; 199 199 } 200 200 … … 247 247 248 248 /* 249 if( rdr->typ=='r' ) 250 { 251 if( rdr->qlen>=rdr->maxqlen ) 252 { 253 log_normal("reader '%s' max. queue length(%d) reached, rejected", rdr->label, 254 rdr->qlen); 255 if( !er->rcEx ) er->rcEx=(E1_READER<<4)|E2_QUEUE; 256 return 0; 257 } 258 else { 259 log_normal("reader '%s' qlen=%d", rdr->label, rdr->qlen); 260 rdr->qlen++; 261 } 262 } 249 if (rdr->typ=='r') { 250 if (rdr->qlen>=rdr->maxqlen) { 251 log_normal("reader '%s' max. queue length(%d) reached, rejected", rdr->label, rdr->qlen); 252 if (!er->rcEx) er->rcEx=(E1_READER<<4)|E2_QUEUE; 253 return 0; 254 } else { 255 log_normal("reader '%s' qlen=%d", rdr->label, rdr->qlen); 256 rdr->qlen++; 257 } 258 } 263 259 */ 264 260 return 1; … … 268 264 { 269 265 if (!((rdr->fd) && (rdr->grp & client[cs_idx].grp))) 270 return (0);266 return 0; 271 267 if (!chk_srvid(er, rdr->cs_idx)) 272 return (0);268 return 0; 273 269 if (!chk_rfilter(er, rdr)) { 274 // 275 return (0);270 // if (!er->rcEx) er->rcEx=(E1_READER<<4)|E2_IDENT; 271 return 0; 276 272 } 277 273 if (!nano_chk_class(er, &rdr->cltab, "reader", rdr->label)) { 278 // 279 return (0);274 // if (!er->rcEx) er->rcEx=(E1_READER<<4)|E2_CLASS; 275 return 0; 280 276 } 281 277 if (!chk_chid(er, &rdr->fchid, "reader", rdr->label)) { 282 // if (!er->rcEx) er->rcEx=(E1_READER<<4)|E2_CHID; 283 return (0); 284 } 285 return (1); 286 } 278 // if (!er->rcEx) er->rcEx=(E1_READER<<4)|E2_CHID; 279 return 0; 280 } 281 282 return 1; 283 }
Note:
See TracChangeset
for help on using the changeset viewer.