1 --- IRRToolSet-4.7.3/src/Core/sched/Dispatcher.hh.orig Tue Apr 9 13:48:45 2002
2 +++ IRRToolSet-4.7.3/src/Core/sched/Dispatcher.hh Tue Jul 8 16:44:03 2003
5 // Time sorted list of system timers
6 class TimerList : public SortedList<Timer> {
8 + friend class Dispatcher;
11 // Handle all expired timers
14 // FIFO queue of one-shot jobs
15 class JobList : public List<Job> {
17 + friend class Dispatcher;
20 // Call back the function associated with the first job
23 // List of signals that we're interested in
24 class SignalList : public List<Signal> {
26 + friend class Dispatcher;
29 // A signal was received, mark it
32 // Collection of open file descriptors in the system
33 class FileList : public FileSet {
35 + friend class Dispatcher;
38 // Process any file descriptors that are readable or writable
39 --- IRRToolSet-4.7.3/src/Core/sys/Time.hh.orig Tue Apr 9 13:48:45 2002
40 +++ IRRToolSet-4.7.3/src/Core/sys/Time.hh Tue Jul 8 16:44:34 2003
44 class TimeShort : public Time<U32> {
46 + friend class TimeLong;
49 // Create empty time instance
53 class TimeLong : public Time<U64> {
55 + friend class TimeShort;
58 // Create an empty time instance
59 --- IRRToolSet-4.7.3/src/Core/util/Buffer.cc.orig Tue Apr 9 13:48:45 2002
60 +++ IRRToolSet-4.7.3/src/Core/util/Buffer.cc Tue Jul 8 16:45:30 2003
65 -void Buffer::insert(Buffer &buf, unsigned long atOffset = 0) {
66 +void Buffer::insert(Buffer &buf, unsigned long atOffset /* = 0 */) {
67 if (size + buf.size > capacity)
69 memmove(contents + atOffset + buf.size,
70 --- IRRToolSet-4.7.3/src/Core/strstream.h.orig Tue Jul 8 16:37:14 2003
71 +++ IRRToolSet-4.7.3/src/Core/strstream.h Tue Jul 8 16:37:37 2003
79 --- IRRToolSet-4.7.3/src/RtConfig/f_cisco.hh.orig Fri Jun 28 15:19:03 2002
80 +++ IRRToolSet-4.7.3/src/RtConfig/f_cisco.hh Tue Jul 8 16:55:57 2003
82 #include "normalform/FilterOfASPath.hh"
84 class FilterOfCommunity;
89 --- IRRToolSet-4.7.3/src/RtConfig/f_junos.hh.orig Tue Apr 9 13:48:46 2002
90 +++ IRRToolSet-4.7.3/src/RtConfig/f_junos.hh Tue Jul 8 16:56:26 2003
92 #include "normalform/FilterOfASPath.hh"
94 class FilterOfCommunity;
99 --- IRRToolSet-4.7.3/src/RtConfig/f_bcc.hh.orig Tue Apr 9 13:48:46 2002
100 +++ IRRToolSet-4.7.3/src/RtConfig/f_bcc.hh Tue Jul 8 16:57:56 2003
102 #include "f_cisco.hh" // included to define ListOf2Ints (should be in util)
104 class FilterOfCommunity;
109 --- IRRToolSet-4.7.3/src/RtConfig/command.l.orig Tue Apr 9 13:48:46 2002
110 +++ IRRToolSet-4.7.3/src/RtConfig/command.l Tue Jul 8 16:59:08 2003
117 static KeyWord keywords[] = {
120 --- IRRToolSet-4.7.3/src/RtConfig/f_junos.cc.orig Thu May 16 15:43:24 2002
121 +++ IRRToolSet-4.7.3/src/RtConfig/f_junos.cc Tue Jul 8 17:01:41 2003
122 @@ -101,21 +101,20 @@
127 - route-filter 127.0.0.0/8 orlonger reject;
128 - route-filter 10.0.0.0/8 orlonger reject;
129 - route-filter 172.16.0.0/12 orlonger reject;
130 - route-filter 192.168.0.0/16 orlonger reject;
131 - route-filter 192.0.2.0/24 orlonger reject;
132 - route-filter 128.0.0.0/16 orlonger reject;
133 - route-filter 191.255.0.0/16 orlonger reject;
134 - route-filter 192.0.0.0/24 orlonger reject;
135 - route-filter 223.255.255.0/24 orlonger reject;
136 - route-filter 224.0.0.0/3 orlonger reject;
137 - route-filter 169.254.0.0/16 orlonger reject;
138 - route-filter 0.0.0.0/0 upto /31 next policy;
139 - route-filter 0.0.0.0/0 upto /32 reject;
141 + char *martians = " \n"
142 +" route-filter 127.0.0.0/8 orlonger reject;\n"
143 +" route-filter 10.0.0.0/8 orlonger reject;\n"
144 +" route-filter 172.16.0.0/12 orlonger reject;\n"
145 +" route-filter 192.168.0.0/16 orlonger reject;\n"
146 +" route-filter 192.0.2.0/24 orlonger reject;\n"
147 +" route-filter 128.0.0.0/16 orlonger reject;\n"
148 +" route-filter 191.255.0.0/16 orlonger reject;\n"
149 +" route-filter 192.0.0.0/24 orlonger reject;\n"
150 +" route-filter 223.255.255.0/24 orlonger reject;\n"
151 +" route-filter 224.0.0.0/3 orlonger reject;\n"
152 +" route-filter 169.254.0.0/16 orlonger reject;\n"
153 +" route-filter 0.0.0.0/0 upto /31 next policy;\n"
154 +" route-filter 0.0.0.0/0 upto /32 reject;\n";
156 cout << " policy-statement supress-martians {\n"
157 << " term martians {\n"
158 --- IRRToolSet-4.7.3/src/aoe/TclApp.cc.orig Tue Apr 9 13:48:46 2002
159 +++ IRRToolSet-4.7.3/src/aoe/TclApp.cc Tue Jul 8 17:28:05 2003
163 TclApplication::TclApplication(char *pzcAppName, char *pzcDisplay,
164 - char *pzcDefaultResource = NULL,
165 - char *pzcResourceFile = NULL)
166 + char *pzcDefaultResource /* = NULL */,
167 + char *pzcResourceFile /* = NULL */)
168 : ptMainWindow(NULL),
169 pzcDisplay(pzcDisplay),
170 pzcDefaultResource(pzcDefaultResource),
171 @@ -176,16 +176,16 @@
175 -char *TclApplication::setVar(char *pzcName, char *pzcValue,
176 - int iFlags = TCL_GLOBAL_ONLY)
177 +const char *TclApplication::setVar(char *pzcName, char *pzcValue,
178 + int iFlags /* = TCL_GLOBAL_ONLY */)
180 SplitName cName(pzcName);
181 return Tcl_SetVar2(ptInterp, cName.name1(), cName.name2(),
185 -char *TclApplication::setVar(char *pzcName, int iValue,
186 - int iFlags = TCL_GLOBAL_ONLY)
187 +const char *TclApplication::setVar(char *pzcName, int iValue,
188 + int iFlags /* = TCL_GLOBAL_ONLY */)
190 SplitName cName(pzcName);
196 -char *TclApplication::getVar(char *pzcName, int iFlags = TCL_GLOBAL_ONLY)
197 +const char *TclApplication::getVar(char *pzcName, int iFlags /* = TCL_GLOBAL_ONLY */)
199 SplitName cName(pzcName);
200 return Tcl_GetVar2(ptInterp, cName.name1(), cName.name2(), iFlags);
201 --- IRRToolSet-4.7.3/src/aoe/TclEntry.hh.orig Tue Apr 9 13:48:46 2002
202 +++ IRRToolSet-4.7.3/src/aoe/TclEntry.hh Tue Jul 8 17:32:28 2003
204 return setValue(pzcValue);
206 int setValue(char *pzcValue);
207 - char *getValue(void);
208 + const char *getValue(void);
211 #endif // TCLENTRY_HH
212 --- IRRToolSet-4.7.3/src/aoe/TclToggleButton.cc.orig Tue Apr 9 13:48:46 2002
213 +++ IRRToolSet-4.7.3/src/aoe/TclToggleButton.cc Tue Jul 8 17:34:55 2003
216 TclToggleButton::TclToggleButton(char *pzcName, char *pzcUnCheckString,
217 char *pzcCheckString,
218 - tdCheckButtonOption eOption = cbUnCheck) :
219 + tdCheckButtonOption eOption /* = cbUnCheck */) :
220 TclCheckButton(pzcName, eOption)
222 this->pzcUnCheckString = strdup(pzcUnCheckString);
225 // Static member function
226 char *TclToggleButton::traceProc(ClientData pvData, Tcl_Interp *pcInterp,
227 - char *pzcName1, char *pzcName2, int iFlags)
228 + const char *pzcName1, const char *pzcName2, int iFlags)
230 TclToggleButton *pcToggleButton = (TclToggleButton *)pvData;
231 return pcToggleButton->traceProc();
232 --- IRRToolSet-4.7.3/src/aoe/TclToggleButton.hh.orig Tue Apr 9 13:48:46 2002
233 +++ IRRToolSet-4.7.3/src/aoe/TclToggleButton.hh Tue Jul 8 17:34:24 2003
236 int label(char *pzcLabel);
237 static char *traceProc(ClientData pvData, Tcl_Interp *pcInterp,
238 - char *pzcName1, char *pzcName2, int iFlags);
239 + const char *pzcName1, const char *pzcName2, int iFlags);
242 char *traceProc(void);
243 --- IRRToolSet-4.7.3/src/aoe/TclVar.cc.orig Tue Apr 9 13:48:46 2002
244 +++ IRRToolSet-4.7.3/src/aoe/TclVar.cc Tue Jul 8 17:35:46 2003
246 Tcl_SetVar2(pcApp->getInterp(), pzcName1, pzcName2, pzcValue, 0);
249 -char *TclVariable::getValue(char *pzcDummy = NULL)
250 +const char *TclVariable::getValue(char *pzcDummy /* = NULL */)
252 TclApplication *pcApp = (TclApplication *)getExtraArgument();
253 return Tcl_GetVar2(pcApp->getInterp(), pzcName1, pzcName2, 0);
256 int TclInt::getValue(void)
258 - char *pzcBuffer = TclVariable::getValue();
259 + const char *pzcBuffer = TclVariable::getValue();
260 return atoi(pzcBuffer);
262 --- IRRToolSet-4.7.3/src/aoe/TclApp.hh.orig Tue Apr 9 13:48:46 2002
263 +++ IRRToolSet-4.7.3/src/aoe/TclApp.hh Tue Jul 8 17:27:56 2003
265 char *getResourceFile(void) { return pzcResourceFile; }
266 void setResult(char *pzcResult) { ptInterp->result = pzcResult; }
267 const char *getResult(void) { return ptInterp->result; }
268 - char *setVar(char *pzcName, char *pzcValue,
269 + const char *setVar(char *pzcName, char *pzcValue,
270 int iFlags = TCL_GLOBAL_ONLY);
271 - char *setVar(char *pzcName, int iValue, int iFlags = TCL_GLOBAL_ONLY);
272 - char *getVar(char *pzcName, int iFlags = TCL_GLOBAL_ONLY);
273 + const char *setVar(char *pzcName, int iValue, int iFlags = TCL_GLOBAL_ONLY);
274 + const char *getVar(char *pzcName, int iFlags = TCL_GLOBAL_ONLY);
275 int createCommand(TclCommand *pcCommand);
276 int insert(TclObject *pcObject);
278 --- IRRToolSet-4.7.3/src/aoe/TclCmd.hh.orig Tue Apr 9 13:48:46 2002
279 +++ IRRToolSet-4.7.3/src/aoe/TclCmd.hh Tue Jul 8 17:31:47 2003
283 static int command(ClientData ptData, Tcl_Interp *ptInterp,
284 - int argc, char *argv[]);
285 + int argc, const char *argv[]);
286 static void cleanUp(ClientData ptData);
289 - virtual int command(int argc, char *argv[]) = 0;
290 + virtual int command(int argc, const char *argv[]) = 0;
291 virtual void cleanUp(void) { delete this; }
294 --- IRRToolSet-4.7.3/src/aoe/TclCheckButton.cc.orig Tue Apr 9 13:48:46 2002
295 +++ IRRToolSet-4.7.3/src/aoe/TclCheckButton.cc Tue Jul 8 17:30:14 2003
298 TclApplication *pcApp = (TclApplication *)getExtraArgument();
299 if (!pcApp) return -1;
301 + const char *pzcBuffer;
302 if ((pzcBuffer = pcApp->getVar(pzcVariableName)) == NULL) return -1;
303 return atoi(pzcBuffer);
305 --- IRRToolSet-4.7.3/src/aoe/TclCmd.cc.orig Tue Apr 9 13:48:46 2002
306 +++ IRRToolSet-4.7.3/src/aoe/TclCmd.cc Tue Jul 8 17:31:35 2003
310 int TclCommand::command(ClientData ptData, Tcl_Interp *ptInterp,
311 - int argc, char *argv[])
312 + int argc, const char *argv[])
314 TclCommand *pcTclCommand = (TclCommand *)ptData;
315 return(pcTclCommand->command(argc, argv));
316 --- IRRToolSet-4.7.3/src/aoe/TclEntry.cc.orig Tue Apr 9 13:48:46 2002
317 +++ IRRToolSet-4.7.3/src/aoe/TclEntry.cc Tue Jul 8 17:32:20 2003
322 -char *TclEntry::getValue(void)
323 +const char *TclEntry::getValue(void)
325 TclApplication *pcApp = (TclApplication *)getExtraArgument();
326 if (!pcApp) return NULL;
327 --- IRRToolSet-4.7.3/src/aoe/TclRadioButton.cc.orig Tue Apr 9 13:48:46 2002
328 +++ IRRToolSet-4.7.3/src/aoe/TclRadioButton.cc Tue Jul 8 17:32:47 2003
331 TclApplication *pcApp = (TclApplication *)getExtraArgument();
332 if (!pcApp) return -1;
334 + const char *pzcBuffer;
335 if ((pzcBuffer = pcApp->getVar(pzcVariableName)) == NULL) return -1;
336 return atoi(pzcBuffer);
338 --- IRRToolSet-4.7.3/src/aoe/TclVar.hh.orig Tue Apr 9 13:48:46 2002
339 +++ IRRToolSet-4.7.3/src/aoe/TclVar.hh Tue Jul 8 17:35:35 2003
342 virtual int setExtraArgument(void *pvExtraArgument);
343 void setValue(char *pzcValue);
344 - char *getValue(char *pzcDummy = NULL);
345 + const char *getValue(char *pzcDummy = NULL);
349 --- IRRToolSet-4.7.3/src/gnug++/BitSet.cc.orig Wed Mar 27 12:32:57 2002
350 +++ IRRToolSet-4.7.3/src/gnug++/BitSet.cc Tue Jul 8 16:51:06 2003
351 @@ -1039,7 +1039,8 @@
353 ostream& operator << (ostream& s, const BitSet& x)
361 --- IRRToolSet-4.7.3/src/gnug++/gcd.cc.orig Wed Mar 27 12:32:57 2002
362 +++ IRRToolSet-4.7.3/src/gnug++/gcd.cc Tue Jul 8 16:53:01 2003
365 long gcd(long x, long y) // euclid's algorithm
374 --- IRRToolSet-4.7.3/src/irr/ripewhoisc.cc.orig Tue Apr 9 13:48:47 2002
375 +++ IRRToolSet-4.7.3/src/irr/ripewhoisc.cc Tue Jul 8 16:39:19 2003
378 RipeWhoisClient::RipeWhoisClient(const char *host,
380 - const char *sources = dflt_sources) :
381 + const char *sources /* = dflt_sources */) :
382 Socket(AF_INET, SOCK_STREAM, IPPROTO_TCP),
383 pzcSourceOriginReply(NULL)
385 Open(host, port, sources);
388 -void RipeWhoisClient::Open(const char *_host = dflt_host,
389 - const int _port = dflt_port,
390 - const char *_sources = dflt_sources)
391 +void RipeWhoisClient::Open(const char *_host /* = dflt_host */,
392 + const int _port /* = dflt_port */,
393 + const char *_sources /* = dflt_sources */)
395 Trace(TR_WHOIS_QUERY) << "Whois: Open "
396 << _host << ":" << _port
397 --- IRRToolSet-4.7.3/src/irr/birdwhoisc.cc.orig Wed Jul 3 11:21:41 2002
398 +++ IRRToolSet-4.7.3/src/irr/birdwhoisc.cc Tue Jul 8 16:41:37 2003
401 BirdWhoisClient::BirdWhoisClient(const char *host,
403 - const char *sources = dflt_sources) :
404 + const char *sources /* = dflt_sources */) :
405 response(NULL), Socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)
407 Open(host, port, sources);
410 -void BirdWhoisClient::Open(const char *_host = dflt_host,
411 - const int _port = dflt_port,
412 - const char *_sources = dflt_sources)
413 +void BirdWhoisClient::Open(const char *_host /* = dflt_host */,
414 + const int _port /* = dflt_port */,
415 + const char *_sources /* = dflt_sources */)
417 //Trace(TR_WHOIS_QUERY) << getsock()
418 // << " - Whois: Open " << _host << ":" << _port
423 - Trace(TR_WHOIS_RESPONSE).form("WhoisResponse[%.*s]\n",
424 + char buf[result->size + 20];
425 + sprintf(buf, "WhoisResponse[%.*s]\n",
426 result->size, result->contents);
427 + Trace(TR_WHOIS_RESPONSE) << buf;
428 text = result->contents;
431 --- IRRToolSet-4.7.3/src/re2dfa/re2dfa.c.orig Tue Apr 9 13:48:47 2002
432 +++ IRRToolSet-4.7.3/src/re2dfa/re2dfa.c Tue Jul 8 16:54:30 2003
435 void debugging_hack() {
436 /* this function lets me put a break point here... */
437 - fprintf(stderr, "InternalError: Too many states in AS path expression
438 -InternalError: Increase RD_MAXASPSTATES in src/re2dfa/re2dfa.h and rebuild.\n");
439 + fprintf(stderr, "InternalError: Too many states in AS path expression\n"
440 +"InternalError: Increase RD_MAXASPSTATES in src/re2dfa/re2dfa.h and rebuild.\n");
443 #define RD_ASSIGN_BIT(s) { \
444 --- IRRToolSet-4.7.3/src/roe/roe_tcl.cc.orig Tue Apr 9 13:48:48 2002
445 +++ IRRToolSet-4.7.3/src/roe/roe_tcl.cc Tue Jul 8 17:05:13 2003
447 extern int irr_pending_replies;
449 int roe_statusbar_hint(ClientData clientData, Tcl_Interp *interp,
450 - int argc, char **argv) {
451 + int argc, const char **argv) {
453 Tcl_SetResult(interp, "wrong # of args", TCL_STATIC);
455 @@ -165,13 +165,13 @@
456 static int roe_routes_hint_index = -1;
458 int roe_routes_hint_reset(ClientData clientData, Tcl_Interp *interp,
459 - int argc, char **argv) {
460 + int argc, const char **argv) {
461 roe_routes_hint_index = -1;
465 int roe_routes_hint(ClientData clientData, Tcl_Interp *interp,
466 - int argc, char **argv) {
467 + int argc, const char **argv) {
469 Tcl_SetResult(interp, "wrong # of args", TCL_STATIC);
474 int roe_file_new_as(ClientData clientData, Tcl_Interp *interp,
475 - int argc, char **argv) {
476 + int argc, const char **argv) {
483 int roe_show_routes(ClientData clientData, Tcl_Interp *interp,
484 - int argc, char **argv) {
485 + int argc, const char **argv) {
487 Tcl_SetResult(interp, "wrong # of args", TCL_STATIC);
492 int roe_select_route(ClientData clientData, Tcl_Interp *interp,
493 - int argc, char **argv) {
494 + int argc, const char **argv) {
496 Tcl_SetResult(interp, "wrong # of args", TCL_STATIC);
501 int roe_show_object(ClientData clientData, Tcl_Interp *interp,
502 - int argc, char **argv) {
503 + int argc, const char **argv) {
506 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
510 int roe_read_bgp_dump(ClientData clientData, Tcl_Interp *interp,
511 - int argc, char **argv) {
512 + int argc, const char **argv) {
515 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
519 int roe_object_delete(ClientData clientData, Tcl_Interp *interp,
520 - int argc, char **argv) {
521 + int argc, const char **argv) {
524 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
528 int roe_object_add(ClientData clientData, Tcl_Interp *interp,
529 - int argc, char **argv) {
530 + int argc, const char **argv) {
533 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
537 int roe_object_update(ClientData clientData, Tcl_Interp *interp,
538 - int argc, char **argv) {
539 + int argc, const char **argv) {
542 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
546 int roe_object_schedule(ClientData clientData, Tcl_Interp *interp,
547 - int argc, char **argv) {
548 + int argc, const char **argv) {
551 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
555 int roe_select_transaction(ClientData clientData, Tcl_Interp *interp,
556 - int argc, char **argv) {
557 + int argc, const char **argv) {
560 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
564 int roe_cancel_transaction(ClientData clientData, Tcl_Interp *interp,
565 - int argc, char **argv) {
566 + int argc, const char **argv) {
569 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
573 int roe_add_selected(ClientData clientData, Tcl_Interp *interp,
574 - int argc, char **argv) {
575 + int argc, const char **argv) {
578 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
582 int roe_del_selected(ClientData clientData, Tcl_Interp *interp,
583 - int argc, char **argv) {
584 + int argc, const char **argv) {
587 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
591 int roe_del_selected_matching_source(ClientData clientData, Tcl_Interp *interp,
592 - int argc, char **argv) {
593 + int argc, const char **argv) {
596 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
600 int roe_config_tmpl(ClientData clientData, Tcl_Interp *interp,
601 - int argc, char **argv) {
602 + int argc, const char **argv) {
605 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
609 int roe_config_tmpl_apply(ClientData clientData, Tcl_Interp *interp,
610 - int argc, char **argv) {
611 + int argc, const char **argv) {
614 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
618 int roe_config_irr(ClientData clientData, Tcl_Interp *interp,
619 - int argc, char **argv) {
620 + int argc, const char **argv) {
623 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
627 int roe_config_irr_apply(ClientData clientData, Tcl_Interp *interp,
628 - int argc, char **argv) {
629 + int argc, const char **argv) {
632 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
636 int roe_config_revert(ClientData clientData, Tcl_Interp *interp,
637 - int argc, char **argv) {
638 + int argc, const char **argv) {
641 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
645 int roe_config_load(ClientData clientData, Tcl_Interp *interp,
646 - int argc, char **argv) {
647 + int argc, const char **argv) {
650 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
654 int roe_config_save(ClientData clientData, Tcl_Interp *interp,
655 - int argc, char **argv) {
656 + int argc, const char **argv) {
659 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
663 int roe_get_more_specifics(ClientData clientData, Tcl_Interp *interp,
664 - int argc, char **argv) {
665 + int argc, const char **argv) {
668 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
672 int roe_get_less_specifics(ClientData clientData, Tcl_Interp *interp,
673 - int argc, char **argv) {
674 + int argc, const char **argv) {
677 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
681 int roe_update_irr(ClientData clientData, Tcl_Interp *interp,
682 - int argc, char **argv) {
683 + int argc, const char **argv) {
686 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
687 --- IRRToolSet-4.7.3/src/roe/object.hh.orig Tue Apr 9 13:48:48 2002
688 +++ IRRToolSet-4.7.3/src/roe/object.hh Tue Jul 8 17:07:33 2003
693 - void display(char *dbase, ASt as, char *rt);
694 + void display(const char *dbase, ASt as, const char *rt);
698 --- IRRToolSet-4.7.3/src/roe/route-list.hh.orig Tue Apr 9 13:48:48 2002
699 +++ IRRToolSet-4.7.3/src/roe/route-list.hh Tue Jul 8 17:11:06 2003
704 - void read_bgp_dump(char *fname);
705 - void get_more_specifics(char *selection);
706 - void get_less_specifics(char *selection);
707 + void read_bgp_dump(const char *fname);
708 + void get_more_specifics(const char *selection);
709 + void get_less_specifics(const char *selection);
711 Route *operator() (int index) {
712 return vrdisplayed[index];
713 --- IRRToolSet-4.7.3/src/roe/schedule.hh.orig Tue Apr 9 13:48:48 2002
714 +++ IRRToolSet-4.7.3/src/roe/schedule.hh Tue Jul 8 17:10:33 2003
717 void select(int index);
718 void cancel(int index);
719 - void add_selected(char *selection);
720 - void del_selected(char *selection);
721 - void del_selected_matching_source(char *selection, char *dbase);
722 + void add_selected(const char *selection);
723 + void del_selected(const char *selection);
724 + void del_selected_matching_source(const char *selection, const char *dbase);
727 void add_internal(char *text);
728 --- IRRToolSet-4.7.3/src/roe/object.cc.orig Tue Apr 9 13:48:48 2002
729 +++ IRRToolSet-4.7.3/src/roe/object.cc Tue Jul 8 17:13:24 2003
731 tcl_Eval(".object.text configure -state disabled");
734 -void RoeObject::display(char *dbase, ASt as, char *rt) {
735 +void RoeObject::display(const char *dbase, ASt as, const char *rt) {
738 tcl_Eval(".object.text configure -state normal");
740 whois->SetSources(dbase);
741 // Modified by wlee@isi.edu
742 // int code = whois->QueryResponse(buffer, "!mrt,%s-AS%d", rt, as);
743 - whois->getRoute(route, rt, as);
744 + whois->getRoute(route, (char*)rt, as);
748 --- IRRToolSet-4.7.3/src/roe/route-list.cc.orig Tue Jun 18 13:00:11 2002
749 +++ IRRToolSet-4.7.3/src/roe/route-list.cc Tue Jul 8 17:14:50 2003
751 get_registrations_init(rlist.head());
754 -void RouteList::read_bgp_dump(char *fname) {
755 +void RouteList::read_bgp_dump(const char *fname) {
763 -void RouteList::get_more_specifics(char *selection) {
764 +void RouteList::get_more_specifics(const char *selection) {
765 RouteList::Route *vr;
772 - for (char *s = strtok(selection, " \t"); s; s = strtok(NULL, " \t")) {
773 + for (char *s = strtok((char*)selection, " \t"); s; s = strtok(NULL, " \t")) {
774 vr = vrdisplayed[atoi(s)];
775 RadixNode *rdnode = irr_radix->find(&vr->route);
778 get_more_specifics_add(rdnode->rght);
781 -void RouteList::get_less_specifics(char *selection) {
782 +void RouteList::get_less_specifics(const char *selection) {
783 RouteList::Route *vr;
790 - for (char *s = strtok(selection, " \t"); s; s = strtok(NULL, " \t")) {
791 + for (char *s = strtok((char*)selection, " \t"); s; s = strtok(NULL, " \t")) {
792 vr = vrdisplayed[atoi(s)];
793 irr_node = irr_radix->find(&vr->route);
794 node = radix.find(&vr->route);
795 --- IRRToolSet-4.7.3/src/roe/schedule.cc.orig Tue Apr 9 13:48:48 2002
796 +++ IRRToolSet-4.7.3/src/roe/schedule.cc Tue Jul 8 17:15:43 2003
797 @@ -170,11 +170,11 @@
798 tcl_Eval(".object.text configure -state disabled");
801 -void Schedule::add_selected(char *selection) {
802 +void Schedule::add_selected(const char *selection) {
806 - for (char *s = strtok(selection, " \t"); s; s = strtok(NULL, " \t")) {
807 + for (char *s = strtok((char*)selection, " \t"); s; s = strtok(NULL, " \t")) {
808 r = routelist(atoi(s));
810 tcl_Eval("set AS AS%d", routelist.as);
811 @@ -186,12 +186,12 @@
815 -void Schedule::del_selected(char *selection) {
816 +void Schedule::del_selected(const char *selection) {
818 RouteList::Route::db_as *p;
821 - for (char *s = strtok(selection, " \t"); s; s = strtok(NULL, " \t")) {
822 + for (char *s = strtok((char*)selection, " \t"); s; s = strtok(NULL, " \t")) {
823 r = routelist(atoi(s));
824 for (p = r->db_as_l.head(); p; p = r->db_as_l.next(p)) {
825 // Modified by wlee@isi.edu
826 @@ -227,12 +227,12 @@
830 -void Schedule::del_selected_matching_source(char *selection, char *dbase) {
831 +void Schedule::del_selected_matching_source(const char *selection, const char *dbase) {
833 RouteList::Route::db_as *p;
836 - for (char *s = strtok(selection, " \t"); s; s = strtok(NULL, " \t")) {
837 + for (char *s = strtok((char*)selection, " \t"); s; s = strtok(NULL, " \t")) {
838 r = routelist(atoi(s));
839 for (p = r->db_as_l.head(); p; p = r->db_as_l.next(p)) {
840 if (!strcmp(dbase, p->db)) {
841 --- IRRToolSet-4.7.3/src/roe/roe_config.cc.orig Tue Apr 9 13:48:48 2002
842 +++ IRRToolSet-4.7.3/src/roe/roe_config.cc Tue Jul 8 17:17:16 2003
843 @@ -182,12 +182,11 @@
846 void Configure::config_tmpl() {
848 -if {[winfo exists .config_tmpl]} {
849 - wm deiconify .config_tmpl
854 +"if {[winfo exists .config_tmpl]} {\n"
855 +" wm deiconify .config_tmpl\n"
857 +"} else {set a 0} \n");
859 if (*(interp->result) != '0') // already displaying a config window
861 @@ -218,12 +217,11 @@
864 void Configure::config_irr() {
866 -if {[winfo exists .config_irr]} {
867 - wm deiconify .config_irr
872 +"if {[winfo exists .config_irr]} {\n"
873 +" wm deiconify .config_irr\n"
875 +"} else {set a 0} \n");
877 if (*(interp->result) != '0') // already displaying a config window
879 @@ -236,11 +234,11 @@
882 for (int i = 0; *dbupdate[i].source; ++i)
883 - tcl_Eval("label .config_irr.source.label.x%s -text %s:
884 -entry .config_irr.source.entry.x%s -relief sunken -bd 2 -width 30
885 -pack .config_irr.source.label.x%s -side top -anchor e -ipady 3 -expand true
886 -pack .config_irr.source.entry.x%s -side top -fill both -expand 1 -pady 1 -padx 1
887 -.config_irr.source.entry.x%s insert 0 {%s}",
888 + tcl_Eval("label .config_irr.source.label.x%s -text %s:\n"
889 +"entry .config_irr.source.entry.x%s -relief sunken -bd 2 -width 30\n"
890 +"pack .config_irr.source.label.x%s -side top -anchor e -ipady 3 -expand true\n"
891 +"pack .config_irr.source.entry.x%s -side top -fill both -expand 1 -pady 1 -padx 1\n"
892 +".config_irr.source.entry.x%s insert 0 {%s}",
893 dbupdate[i].source, dbupdate[i].source, dbupdate[i].source,
894 dbupdate[i].source, dbupdate[i].source, dbupdate[i].source,
896 --- IRRToolSet-4.7.3/src/rpsl/rpsl/prefix.hh.orig Tue Apr 9 13:48:48 2002
897 +++ IRRToolSet-4.7.3/src/rpsl/rpsl/prefix.hh Tue Jul 8 15:48:47 2003
903 +#include <ostream.h>
905 char* int2quad(char *buffer, unsigned int i);
906 unsigned int quad2int(char *quad);
907 --- IRRToolSet-4.7.3/src/rpsl/rpsl/rpsl_item.hh.orig Tue Apr 9 13:48:49 2002
908 +++ IRRToolSet-4.7.3/src/rpsl/rpsl/rpsl_item.hh Tue Jul 8 15:50:31 2003
913 +#include <ostream.h>
919 typedef unsigned int ASt;
925 --- IRRToolSet-4.7.3/src/rpsl/rpsl/rpsl_filter.hh.orig Tue Apr 9 13:48:49 2002
926 +++ IRRToolSet-4.7.3/src/rpsl/rpsl/rpsl_filter.hh Tue Jul 8 15:51:08 2003
931 +#include <ostream.h>
937 typedef unsigned int ASt;
943 --- IRRToolSet-4.7.3/src/rpsl/rpsl/rpsl_policy.hh.orig Tue Apr 9 13:48:49 2002
944 +++ IRRToolSet-4.7.3/src/rpsl/rpsl/rpsl_policy.hh Tue Jul 8 15:51:40 2003
949 +#include <ostream.h>
955 typedef unsigned int ASt;
961 --- IRRToolSet-4.7.3/src/rpsl/rpsl/rpsl_attr.hh.orig Tue Apr 9 13:48:48 2002
962 +++ IRRToolSet-4.7.3/src/rpsl/rpsl/rpsl_attr.hh Tue Jul 8 15:52:11 2003
967 +#include <ostream.h>
973 typedef unsigned int ASt;
979 --- IRRToolSet-4.7.3/src/rpsl/rpsl/object.hh.orig Tue Apr 9 13:48:48 2002
980 +++ IRRToolSet-4.7.3/src/rpsl/rpsl/object.hh Tue Jul 8 15:52:48 2003
985 +#include <iostream.h>
986 #include "util/List.hh"
987 #include "util/Buffer.hh"
988 #include "util/debug.hh"
990 #define RPSL_CLASS_UNKONWN 0
991 #define RPSL_CLASS_AUTNUM 1
998 class Object : public Buffer {
999 --- IRRToolSet-4.7.3/src/rpsl/rpsl/rpsl_item.cc.orig Tue Apr 9 13:48:49 2002
1000 +++ IRRToolSet-4.7.3/src/rpsl/rpsl/rpsl_item.cc Tue Jul 8 16:24:12 2003
1005 -Buffer *ItemASNO::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1006 +Buffer *ItemASNO::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1009 buf->appendf("as%d", asno);
1014 -Buffer *ItemMSItem::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1015 +Buffer *ItemMSItem::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1016 buf = item->bufferize(buf, lcase);
1023 -Buffer *ItemFilter::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1024 +Buffer *ItemFilter::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1025 cerr << "Error: I dont know how to canonicalize filters" << endl;
1032 -Buffer *ItemINT::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1033 +Buffer *ItemINT::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1036 buf->appendf("%d", i);
1037 @@ -139,13 +139,15 @@
1038 ostream &ItemTimeStamp::print(ostream &out) const {
1040 ts = gmtime(&stamp);
1041 - out.form("%04d%02d%02d %02d:%02d:%02d +00:00",
1043 + sprintf(buf, "%04d%02d%02d %02d:%02d:%02d +00:00",
1044 ts->tm_year + 1900, ts->tm_mon+1, ts->tm_mday,
1045 ts->tm_hour, ts->tm_min, ts->tm_sec);
1050 -Buffer *ItemTimeStamp::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1051 +Buffer *ItemTimeStamp::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false*/) const {
1053 ts = gmtime(&stamp);
1059 -Buffer *ItemREAL::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1060 +Buffer *ItemREAL::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1063 buf->appendf("%f", real);
1068 -Buffer *ItemSTRING::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1069 +Buffer *ItemSTRING::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1072 buf->append(string);
1077 -Buffer *ItemBLOB::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1078 +Buffer *ItemBLOB::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1082 @@ -197,11 +199,13 @@
1085 ostream &ItemBUFFER::print(ostream &out) const {
1086 - out.form("%.*s", buffer->size, buffer->contents);
1087 + char buf[buffer->size+2];
1088 + sprintf(buf, "%.*s", buffer->size, buffer->contents);
1093 -Buffer *ItemBUFFER::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1094 +Buffer *ItemBUFFER::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1096 buf = new Buffer(*buffer);
1102 -Buffer *ItemIPV4::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1103 +Buffer *ItemIPV4::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1106 buf->append(ipv4->get_text());
1111 -Buffer *ItemPRFXV4::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1112 +Buffer *ItemPRFXV4::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1115 buf->append(prfxv4->get_text());
1120 -Buffer *ItemPRFXV4Range::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1121 +Buffer *ItemPRFXV4Range::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1124 buf->append(prfxv4->get_text());
1129 -Buffer *ItemConnection::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1130 +Buffer *ItemConnection::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1138 -Buffer *ItemSID::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1139 +Buffer *ItemSID::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1147 -Buffer *ItemBOOLEAN::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1148 +Buffer *ItemBOOLEAN::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1151 buf->append((i ? "true" : "false"));
1156 -Buffer *ItemWORD::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1157 +Buffer *ItemWORD::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1165 -Buffer *ItemEMAIL::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1166 +Buffer *ItemEMAIL::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1174 -Buffer *ItemRange::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1175 +Buffer *ItemRange::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1176 buf = begin->bufferize(buf, false);
1178 end->bufferize(buf, false);
1183 -Buffer *ItemFREETEXT::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1184 +Buffer *ItemFREETEXT::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1187 buf->append(text, length);
1192 -Buffer *ItemList::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1193 +Buffer *ItemList::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1194 cerr << "Error: I dont know how to canonicalize lists" << endl;
1201 -Buffer *ItemSequence::bufferize(Buffer *buf = NULL, bool lcase = false) const {
1202 +Buffer *ItemSequence::bufferize(Buffer *buf /* = NULL */, bool lcase /* = false */) const {
1203 cerr << "Error: I dont know how to canonicalize sequences" << endl;
1206 --- IRRToolSet-4.7.3/src/rpsl/rpsl/rpsl.y.orig Tue Apr 9 13:48:48 2002
1207 +++ IRRToolSet-4.7.3/src/rpsl/rpsl/rpsl.y Tue Jul 8 16:26:22 2003
1208 @@ -2031,7 +2031,7 @@
1210 void handleArgumentTypeError(char *attr, char *method, int position,
1211 const RPType *correctType,
1212 - bool isOperator = false) {
1213 + bool isOperator /* = false */) {
1216 handle_error("Error: argument %d to %s.operator%s should be %s.\n",
1217 --- IRRToolSet-4.7.3/src/rpsl/rpsl/schema_rpsl.cc.orig Tue Apr 9 13:48:49 2002
1218 +++ IRRToolSet-4.7.3/src/rpsl/rpsl/schema_rpsl.cc Tue Jul 8 16:36:05 2003
1219 @@ -74,302 +74,300 @@
1221 char Schema::dictionary_text[] = "";
1223 -#define CMN_ATTRS "
1224 -attr: notify syntax(email), optional, multiple
1225 -attr: remarks optional, multiple
1226 -attr: source syntax(rpsl_word), mandatory, single, internal
1227 -attr: integrity syntax(rpsl_word), optional, single, internal
1228 -attr: changed optional, multiple
1229 -attr: deleted optional, single, deleted"
1231 -static char base_text[] = "class: dictionary
1232 -attr: dictionary syntax(rpsl_word), mandatory, single, key
1233 -attr: rp-attribute syntax(special,rp-attribute), optional, multiple
1234 -attr: typedef syntax(special,typedef), optional, multiple
1235 -attr: protocol syntax(special,protocol), optional, multiple " CMN_ATTRS "
1236 -attr: descr mandatory, multiple
1237 -attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup
1238 -attr: tech-c mandatory, multiple, lookup
1239 -attr: admin-c optional, multiple, lookup
1242 -descr: rpsl dictionary
1243 -admin-c: Cengiz Alaettinoglu
1244 -tech-c: Cengiz Alaettinoglu
1246 -changed: cengiz@isi.edu 19980324
1248 -typedef: ListOfIPv4Prefix list of Address_Prefix
1249 -typedef: as_number-as_set_name union as_number, as_set_name
1250 -typedef: ListOfas_number list of as_number
1251 -typedef: ListOfas_number-as_set_name list of as_number-as_set_name
1252 -typedef: ListOfas_set_name list of as_set_name
1253 -typedef: ListOfroute_set_name list of route_set_name
1254 -typedef: as_number-as_set_name-route_set_name-IPv4Prefix
1255 - union as_number, as_set_name, route_set_name, Address_Prefix
1256 -typedef: ListOfas_number-as_set_name-route_set_name-IPv4Prefix
1257 - list of as_number-as_set_name-route_set_name-IPv4Prefix
1258 -typedef: ListOfrpsl_word List of rpsl_word
1259 -rp-attribute: # preference, smaller values represent higher preferences
1261 - operator=(integer[0, 65535])
1262 -rp-attribute: # BGP multi_exit_discriminator attribute
1264 - operator=(union integer[0, 65535], enum[igp_cost])
1265 - # to set med to the IGP metric: med = igp_cost;
1266 - #operator=(enum[igp_cost])
1267 -rp-attribute: # BGP destination preference attribute (dpa)
1269 - operator=(integer[0, 65535])
1270 -rp-attribute: # BGP aspath attribute
1272 - # prepends AS numbers from last to first order
1273 - prepend(as_number, ...)
1274 -typedef: # a community value in RPSL is either
1275 - # - a 4 byte integer
1276 - # - internet, no_export, no_advertise (see RFC-1997)
1277 - community_elm union
1278 - integer[1, 4294967295],
1279 - enum[internet, no_export, no_advertise]
1280 -typedef: # list of community values { 40, no_export, 3561:70}
1282 - list of community_elm
1283 -rp-attribute: # BGP community attribute
1285 - # set to a list of communities
1286 - operator=(community_list)
1287 - # order independent equality comparison
1288 - operator==(community_list)
1289 - # append community values
1290 - operator.=(community_list)
1291 - append(community_elm, ...)
1292 - # delete community values
1293 - delete(community_elm, ...)
1294 - # a filter: true if one of community values is contained
1295 - contains(community_elm, ...)
1296 - # shortcut to contains: community(no_export, {3561,70})
1297 - operator()(community_elm, ...)
1298 -rp-attribute: # next hop router in a static route
1300 - operator=(ipv4_address) # a router address
1301 - operator=(enum[self]) # router's own address
1302 -rp-attribute: # cost of a static route
1304 - operator=(integer[0, 65535])
1306 - # as number of the peer router
1307 - MANDATORY asno(as_number)
1308 - # enable flap damping
1309 - OPTIONAL flap_damp()
1310 - OPTIONAL flap_damp(integer[0,65535],# penalty per flap
1311 - integer[0,65535],# penalty value for supression
1312 - integer[0,65535],# penalty value for reuse
1313 - integer[0,65535],# halflife in secs when up
1314 - integer[0,65535],# halflife in secs when down
1315 - integer[0,65535])# maximum penalty
1329 -static char classes_text[] = "class: mntner
1330 -attr: mntner syntax(rpsl_word), mandatory, single, key
1331 -attr: auth syntax(special, blobs), mandatory, multiple
1332 -attr: upd-to syntax(email), mandatory, multiple
1333 -attr: mnt-nfy syntax(email), optional, multiple " CMN_ATTRS "
1334 -attr: descr mandatory, multiple
1335 -attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup
1336 -attr: admin-c mandatory, multiple, lookup
1337 -attr: tech-c optional, multiple, lookup
1340 -attr: person mandatory, single, lookup
1341 -attr: nic-hdl syntax(rpsl_word), mandatory, single, key
1342 -attr: address mandatory, multiple
1343 -attr: phone mandatory, multiple
1344 -attr: fax-no optional, multiple
1345 -attr: e-mail syntax(email), optional, multiple, lookup " CMN_ATTRS "
1346 -attr: mnt-by syntax(list of rpsl_word), optional, multiple, lookup
1349 -attr: role mandatory, single, lookup
1350 -attr: nic-hdl mandatory, single, key
1351 -attr: address mandatory, multiple
1352 -attr: phone mandatory, multiple
1353 -attr: fax-no optional, multiple
1354 -attr: e-mail syntax(email), mandatory, multiple, lookup
1355 -attr: trouble optional, multiple " CMN_ATTRS "
1356 -attr: mnt-by syntax(list of rpsl_word), optional, multiple, lookup
1357 -attr: admin-c mandatory, multiple, lookup
1358 -attr: tech-c mandatory, multiple, lookup
1361 -attr: route syntax(address_prefix), mandatory, single, key, lookup
1362 -attr: origin syntax(as_number), mandatory, single, key, lookup
1363 -attr: withdrawn syntax(date), optional, single, deleted
1364 -attr: member-of syntax(ListOfroute_set_name), optional, multiple, lookup
1365 -attr: inject syntax(special, inject), optional, multiple
1366 -attr: components syntax(special, components), optional, single
1367 -attr: aggr-bndry syntax(special, aggr-bndry), optional, single
1368 -attr: aggr-mtd syntax(special, aggr-mtd), optional, single
1369 -attr: export-comps syntax(special, filter), optional, single
1370 -attr: holes syntax(ListOfIPv4Prefix), optional, multiple " CMN_ATTRS "
1371 -attr: descr mandatory, multiple
1372 -attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup
1373 -attr: admin-c optional, multiple, lookup
1374 -attr: tech-c optional, multiple, lookup
1375 -attr: cross-nfy syntax(list of rpsl_word), optional, multiple
1376 -attr: cross-mnt syntax(list of rpsl_word), optional, multiple
1379 -attr: route-set syntax(route_set_name), mandatory, single, key
1380 -attr: members syntax(special, rs-members), optional, multiple, lookup
1381 -attr: mbrs-by-ref syntax(list of rpsl_Word), optional, multiple, lookup " CMN_ATTRS "
1382 -attr: descr mandatory, multiple
1383 -attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup
1384 -attr: admin-c mandatory, multiple, lookup
1385 -attr: tech-c mandatory, multiple, lookup
1388 -attr: as-set syntax(as_set_name), mandatory, single, key
1389 -attr: members syntax(list of union as_number, as_set_name), optional, multiple, lookup
1390 -attr: mbrs-by-ref syntax(list of rpsl_word), optional, multiple, lookup " CMN_ATTRS "
1391 -attr: descr mandatory, multiple
1392 -attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup
1393 -attr: admin-c mandatory, multiple, lookup
1394 -attr: tech-c mandatory, multiple, lookup
1397 -attr: rtr-set syntax(rtr_set_name), mandatory, single, key
1398 -attr: members syntax(list of union rtr_set_name, dns_name, ipv4_address), optional, multiple, lookup
1399 -attr: mbrs-by-ref syntax(list of rpsl_Word), optional, multiple, lookup " CMN_ATTRS "
1400 -attr: descr mandatory, multiple
1401 -attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup
1402 -attr: admin-c mandatory, multiple, lookup
1403 -attr: tech-c mandatory, multiple, lookup
1406 -attr: peering-set syntax(peering_set_name), mandatory, single, key
1407 -attr: peering syntax(special, peering), mandatory, multiple " CMN_ATTRS "
1408 -attr: descr mandatory, multiple
1409 -attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup
1410 -attr: admin-c mandatory, multiple, lookup
1411 -attr: tech-c mandatory, multiple, lookup
1414 -attr: filter-set syntax(filter_set_name), mandatory, single, key
1415 -attr: filter syntax(special, filter), mandatory, single " CMN_ATTRS "
1416 -attr: descr mandatory, multiple
1417 -attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup
1418 -attr: admin-c mandatory, multiple, lookup
1419 -attr: tech-c mandatory, multiple, lookup
1422 -attr: aut-num syntax(as_number), mandatory, single, key
1423 -attr: as-name syntax(rpsl_word), mandatory, single, lookup
1424 -attr: member-of syntax(List Of AS_set_name), optional, multiple, lookup
1425 -attr: import syntax(special,import), optional, multiple
1426 -attr: export syntax(special,export), optional, multiple
1427 -attr: default syntax(special,default), optional, multiple " CMN_ATTRS "
1428 -attr: descr mandatory, multiple
1429 -attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup
1430 -attr: mnt-routes syntax(special, mnt-routes), optional, multiple, lookup
1431 -attr: admin-c mandatory, multiple, lookup
1432 -attr: tech-c mandatory, multiple, lookup
1433 -attr: cross-nfy syntax(list of rpsl_word), optional, multiple
1434 -attr: cross-mnt syntax(list of rpsl_word), optional, multiple
1437 -attr: inet-rtr syntax(dns_name), mandatory, single, key
1438 -attr: alias syntax(dns_name), optional, multiple, lookup
1439 -attr: local-as syntax(as_number), mandatory, single, lookup
1440 -attr: ifaddr syntax(special,ifaddr), mandatory, multiple
1441 -attr: peer syntax(special,peer), optional, multiple " CMN_ATTRS "
1442 -attr: member-of syntax(List Of rtr_set_name), optional, multiple, lookup
1443 -attr: descr optional, multiple
1444 -attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup
1445 -attr: admin-c mandatory, multiple, lookup
1446 -attr: tech-c mandatory, multiple, lookup
1449 -attr: inetnum syntax(range of ipv4_address), mandatory, single, key
1450 -attr: netname mandatory, single, lookup
1451 -attr: country mandatory, multiple
1452 -attr: rev-srv optional, multiple, lookup
1453 -attr: status mandatory, single
1454 -attr: mnt-lower syntax(ListOfrpsl_word), optional, multiple " CMN_ATTRS "
1455 -attr: descr mandatory, multiple
1456 -attr: mnt-by syntax(list of rpsl_word), optional, multiple, lookup
1457 -attr: admin-c mandatory, multiple, lookup
1458 -attr: tech-c mandatory, multiple, lookup
1461 -attr: domain syntax(dns_name), mandatory, single, key
1462 -attr: sub-dom optional, multiple, lookup
1463 -attr: dom-net optional, multiple
1464 -attr: zone-c mandatory, multiple, lookup
1465 -attr: nserver optional, multiple, lookup
1466 -attr: mnt-lower syntax(ListOfrpsl_word), optional, multiple " CMN_ATTRS "
1467 -attr: descr mandatory, multiple
1468 -attr: mnt-by syntax(list of rpsl_word), optional, multiple, lookup
1469 -attr: admin-c mandatory, multiple, lookup
1470 -attr: tech-c mandatory, multiple, lookup
1473 -attr: limerick mandatory, single, key
1474 -attr: text mandatory, multiple
1475 -attr: author mandatory, multiple, lookup " CMN_ATTRS "
1476 -attr: descr optional, multiple
1477 -attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup
1478 -attr: admin-c mandatory, multiple, lookup
1481 -attr: as-block syntax(union as_number, range of as_number), mandatory, single, key
1482 -attr: mnt-lower syntax(ListOfrpsl_word), optional, multiple " CMN_ATTRS "
1483 -attr: descr mandatory, multiple
1484 -attr: mnt-by syntax(list of rpsl_word), optional, multiple, lookup
1485 -attr: admin-c mandatory, multiple, lookup
1486 -attr: tech-c mandatory, multiple, lookup
1489 -attr: key-cert mandatory, single, key, syntax(rpsl_word)
1490 -attr: method mandatory, single, syntax(rpsl_word)
1491 -attr: owner mandatory, multiple
1492 -attr: fingerpr mandatory, single
1493 -attr: certif mandatory, single
1494 -attr: remarks optional, multiple
1495 -attr: source mandatory, single, lookup, syntax(rpsl_word)
1496 -attr: changed optional, multiple
1497 -attr: deleted optional, single, deleted
1498 -attr: mnt-by mandatory, multiple, lookup, syntax(list of rpsl_word)
1499 -attr: notify optional, multiple, syntax(email)
1502 -attr: peval syntax(special,filter), optional, single
1505 -attr: repository mandatory, single, key, syntax(rpsl_word)
1506 -attr: query-address mandatory, multiple
1507 -attr: response-auth-type mandatory, multiple
1508 -attr: submit-address mandatory, multiple
1509 -attr: submit-auth-type mandatory, multiple
1510 -attr: repository-cert mandatory, multiple
1511 -attr: expire mandatory, single
1512 -attr: heartbeat-interval mandatory, single
1513 -attr: descr optional, multiple
1514 -attr: admin-c mandatory, multiple, lookup
1515 -attr: tech-c mandatory, multiple, lookup
1516 -attr: mnt-by mandatory, multiple, lookup " CMN_ATTRS "
1519 +#define CMN_ATTRS "\n" \
1520 +"attr: notify syntax(email), optional, multiple\n" \
1521 +"attr: remarks optional, multiple\n" \
1522 +"attr: source syntax(rpsl_word), mandatory, single, internal\n" \
1523 +"attr: integrity syntax(rpsl_word), optional, single, internal\n" \
1524 +"attr: changed optional, multiple\n" \
1525 +"attr: deleted optional, single, deleted"
1527 +static char base_text[] = "class: dictionary \n"
1528 +"attr: dictionary syntax(rpsl_word), mandatory, single, key\n"
1529 +"attr: rp-attribute syntax(special,rp-attribute), optional, multiple\n"
1530 +"attr: typedef syntax(special,typedef), optional, multiple\n"
1531 +"attr: protocol syntax(special,protocol), optional, multiple " CMN_ATTRS "\n"
1532 +"attr: descr mandatory, multiple\n"
1533 +"attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup\n"
1534 +"attr: tech-c mandatory, multiple, lookup\n"
1535 +"attr: admin-c optional, multiple, lookup\n"
1537 +"dictionary: rpsl\n"
1538 +"descr: rpsl dictionary\n"
1539 +"admin-c: Cengiz Alaettinoglu\n"
1540 +"tech-c: Cengiz Alaettinoglu\n"
1541 +"mnt-by: MNT-CENGIZ\n"
1542 +"changed: cengiz@isi.edu 19980324\n"
1544 +"typedef: ListOfIPv4Prefix list of Address_Prefix\n"
1545 +"typedef: as_number-as_set_name union as_number, as_set_name\n"
1546 +"typedef: ListOfas_number list of as_number\n"
1547 +"typedef: ListOfas_number-as_set_name list of as_number-as_set_name\n"
1548 +"typedef: ListOfas_set_name list of as_set_name\n"
1549 +"typedef: ListOfroute_set_name list of route_set_name\n"
1550 +"typedef: as_number-as_set_name-route_set_name-IPv4Prefix\n"
1551 +" union as_number, as_set_name, route_set_name, Address_Prefix\n"
1552 +"typedef: ListOfas_number-as_set_name-route_set_name-IPv4Prefix\n"
1553 +" list of as_number-as_set_name-route_set_name-IPv4Prefix\n"
1554 +"typedef: ListOfrpsl_word List of rpsl_word\n"
1555 +"rp-attribute: # preference, smaller values represent higher preferences\n"
1557 +" operator=(integer[0, 65535]) \n"
1558 +"rp-attribute: # BGP multi_exit_discriminator attribute\n"
1560 +" operator=(union integer[0, 65535], enum[igp_cost])\n"
1561 +" # to set med to the IGP metric: med = igp_cost;\n"
1562 +" #operator=(enum[igp_cost])\n"
1563 +"rp-attribute: # BGP destination preference attribute (dpa)\n"
1565 +" operator=(integer[0, 65535]) \n"
1566 +"rp-attribute: # BGP aspath attribute\n"
1568 +" # prepends AS numbers from last to first order\n"
1569 +" prepend(as_number, ...)\n"
1570 +"typedef: # a community value in RPSL is either\n"
1571 +" # - a 4 byte integer\n"
1572 +" # - internet, no_export, no_advertise (see RFC-1997)\n"
1573 +" community_elm union\n"
1574 +" integer[1, 4294967295],\n"
1575 +" enum[internet, no_export, no_advertise]\n"
1576 +"typedef: # list of community values { 40, no_export, 3561:70}\n"
1577 +" community_list\n"
1578 +" list of community_elm\n"
1579 +"rp-attribute: # BGP community attribute\n"
1581 +" # set to a list of communities\n"
1582 +" operator=(community_list)\n"
1583 +" # order independent equality comparison\n"
1584 +" operator==(community_list) \n"
1585 +" # append community values \n"
1586 +" operator.=(community_list)\n"
1587 +" append(community_elm, ...)\n"
1588 +" # delete community values\n"
1589 +" delete(community_elm, ...)\n"
1590 +" # a filter: true if one of community values is contained\n"
1591 +" contains(community_elm, ...)\n"
1592 +" # shortcut to contains: community(no_export, {3561,70})\n"
1593 +" operator()(community_elm, ...)\n"
1594 +"rp-attribute: # next hop router in a static route\n"
1596 +" operator=(ipv4_address) # a router address\n"
1597 +" operator=(enum[self]) # router's own address\n"
1598 +"rp-attribute: # cost of a static route\n"
1600 +" operator=(integer[0, 65535])\n"
1602 +" # as number of the peer router\n"
1603 +" MANDATORY asno(as_number)\n"
1604 +" # enable flap damping\n"
1605 +" OPTIONAL flap_damp() \n"
1606 +" OPTIONAL flap_damp(integer[0,65535],# penalty per flap\n"
1607 +" integer[0,65535],# penalty value for supression\n"
1608 +" integer[0,65535],# penalty value for reuse\n"
1609 +" integer[0,65535],# halflife in secs when up\n"
1610 +" integer[0,65535],# halflife in secs when down\n"
1611 +" integer[0,65535])# maximum penalty\n"
1615 +"protocol: IS-IS\n"
1616 +"protocol: STATIC\n"
1617 +"protocol: RIPng\n"
1618 +"protocol: DVMRP\n"
1619 +"protocol: PIM-DM\n"
1620 +"protocol: PIM-SM\n"
1622 +"protocol: MOSPF\n";
1624 +static char classes_text[] = "class: mntner\n"
1625 +"attr: mntner syntax(rpsl_word), mandatory, single, key\n"
1626 +"attr: auth syntax(special, blobs), mandatory, multiple\n"
1627 +"attr: upd-to syntax(email), mandatory, multiple\n"
1628 +"attr: mnt-nfy syntax(email), optional, multiple " CMN_ATTRS "\n"
1629 +"attr: descr mandatory, multiple\n"
1630 +"attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup\n"
1631 +"attr: admin-c mandatory, multiple, lookup\n"
1632 +"attr: tech-c optional, multiple, lookup\n"
1635 +"attr: person mandatory, single, lookup\n"
1636 +"attr: nic-hdl syntax(rpsl_word), mandatory, single, key\n"
1637 +"attr: address mandatory, multiple\n"
1638 +"attr: phone mandatory, multiple\n"
1639 +"attr: fax-no optional, multiple\n"
1640 +"attr: e-mail syntax(email), optional, multiple, lookup " CMN_ATTRS "\n"
1641 +"attr: mnt-by syntax(list of rpsl_word), optional, multiple, lookup\n"
1644 +"attr: role mandatory, single, lookup\n"
1645 +"attr: nic-hdl mandatory, single, key\n"
1646 +"attr: address mandatory, multiple\n"
1647 +"attr: phone mandatory, multiple\n"
1648 +"attr: fax-no optional, multiple\n"
1649 +"attr: e-mail syntax(email), mandatory, multiple, lookup\n"
1650 +"attr: trouble optional, multiple " CMN_ATTRS "\n"
1651 +"attr: mnt-by syntax(list of rpsl_word), optional, multiple, lookup\n"
1652 +"attr: admin-c mandatory, multiple, lookup\n"
1653 +"attr: tech-c mandatory, multiple, lookup\n"
1656 +"attr: route syntax(address_prefix), mandatory, single, key, lookup\n"
1657 +"attr: origin syntax(as_number), mandatory, single, key, lookup\n"
1658 +"attr: withdrawn syntax(date), optional, single, deleted\n"
1659 +"attr: member-of syntax(ListOfroute_set_name), optional, multiple, lookup\n"
1660 +"attr: inject syntax(special, inject), optional, multiple\n"
1661 +"attr: components syntax(special, components), optional, single\n"
1662 +"attr: aggr-bndry syntax(special, aggr-bndry), optional, single\n"
1663 +"attr: aggr-mtd syntax(special, aggr-mtd), optional, single\n"
1664 +"attr: export-comps syntax(special, filter), optional, single\n"
1665 +"attr: holes syntax(ListOfIPv4Prefix), optional, multiple " CMN_ATTRS "\n"
1666 +"attr: descr mandatory, multiple\n"
1667 +"attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup\n"
1668 +"attr: admin-c optional, multiple, lookup\n"
1669 +"attr: tech-c optional, multiple, lookup\n"
1670 +"attr: cross-nfy syntax(list of rpsl_word), optional, multiple\n"
1671 +"attr: cross-mnt syntax(list of rpsl_word), optional, multiple\n"
1673 +"class: route-set\n"
1674 +"attr: route-set syntax(route_set_name), mandatory, single, key\n"
1675 +"attr: members syntax(special, rs-members), optional, multiple, lookup \n"
1676 +"attr: mbrs-by-ref syntax(list of rpsl_Word), optional, multiple, lookup " CMN_ATTRS "\n"
1677 +"attr: descr mandatory, multiple\n"
1678 +"attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup\n"
1679 +"attr: admin-c mandatory, multiple, lookup\n"
1680 +"attr: tech-c mandatory, multiple, lookup\n"
1683 +"attr: as-set syntax(as_set_name), mandatory, single, key\n"
1684 +"attr: members syntax(list of union as_number, as_set_name), optional, multiple, lookup \n"
1685 +"attr: mbrs-by-ref syntax(list of rpsl_word), optional, multiple, lookup " CMN_ATTRS "\n"
1686 +"attr: descr mandatory, multiple\n"
1687 +"attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup\n"
1688 +"attr: admin-c mandatory, multiple, lookup\n"
1689 +"attr: tech-c mandatory, multiple, lookup\n"
1692 +"attr: rtr-set syntax(rtr_set_name), mandatory, single, key\n"
1693 +"attr: members syntax(list of union rtr_set_name, dns_name, ipv4_address), optional, multiple, lookup \n"
1694 +"attr: mbrs-by-ref syntax(list of rpsl_Word), optional, multiple, lookup " CMN_ATTRS "\n"
1695 +"attr: descr mandatory, multiple\n"
1696 +"attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup\n"
1697 +"attr: admin-c mandatory, multiple, lookup\n"
1698 +"attr: tech-c mandatory, multiple, lookup\n"
1700 +"class: peering-set\n"
1701 +"attr: peering-set syntax(peering_set_name), mandatory, single, key\n"
1702 +"attr: peering syntax(special, peering), mandatory, multiple " CMN_ATTRS "\n"
1703 +"attr: descr mandatory, multiple\n"
1704 +"attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup\n"
1705 +"attr: admin-c mandatory, multiple, lookup\n"
1706 +"attr: tech-c mandatory, multiple, lookup\n"
1708 +"class: filter-set\n"
1709 +"attr: filter-set syntax(filter_set_name), mandatory, single, key\n"
1710 +"attr: filter syntax(special, filter), mandatory, single " CMN_ATTRS "\n"
1711 +"attr: descr mandatory, multiple\n"
1712 +"attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup\n"
1713 +"attr: admin-c mandatory, multiple, lookup\n"
1714 +"attr: tech-c mandatory, multiple, lookup\n"
1717 +"attr: aut-num syntax(as_number), mandatory, single, key\n"
1718 +"attr: as-name syntax(rpsl_word), mandatory, single, lookup\n"
1719 +"attr: member-of syntax(List Of AS_set_name), optional, multiple, lookup\n"
1720 +"attr: import syntax(special,import), optional, multiple\n"
1721 +"attr: export syntax(special,export), optional, multiple\n"
1722 +"attr: default syntax(special,default), optional, multiple " CMN_ATTRS "\n"
1723 +"attr: descr mandatory, multiple\n"
1724 +"attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup\n"
1725 +"attr: mnt-routes syntax(special, mnt-routes), optional, multiple, lookup\n"
1726 +"attr: admin-c mandatory, multiple, lookup\n"
1727 +"attr: tech-c mandatory, multiple, lookup\n"
1728 +"attr: cross-nfy syntax(list of rpsl_word), optional, multiple\n"
1729 +"attr: cross-mnt syntax(list of rpsl_word), optional, multiple\n"
1731 +"class: inet-rtr\n"
1732 +"attr: inet-rtr syntax(dns_name), mandatory, single, key\n"
1733 +"attr: alias syntax(dns_name), optional, multiple, lookup\n"
1734 +"attr: local-as syntax(as_number), mandatory, single, lookup\n"
1735 +"attr: ifaddr syntax(special,ifaddr), mandatory, multiple\n"
1736 +"attr: peer syntax(special,peer), optional, multiple " CMN_ATTRS "\n"
1737 +"attr: member-of syntax(List Of rtr_set_name), optional, multiple, lookup\n"
1738 +"attr: descr optional, multiple\n"
1739 +"attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup\n"
1740 +"attr: admin-c mandatory, multiple, lookup\n"
1741 +"attr: tech-c mandatory, multiple, lookup\n"
1744 +"attr: inetnum syntax(range of ipv4_address), mandatory, single, key\n"
1745 +"attr: netname mandatory, single, lookup\n"
1746 +"attr: country mandatory, multiple\n"
1747 +"attr: rev-srv optional, multiple, lookup\n"
1748 +"attr: status mandatory, single\n"
1749 +"attr: mnt-lower syntax(ListOfrpsl_word), optional, multiple " CMN_ATTRS "\n"
1750 +"attr: descr mandatory, multiple\n"
1751 +"attr: mnt-by syntax(list of rpsl_word), optional, multiple, lookup\n"
1752 +"attr: admin-c mandatory, multiple, lookup\n"
1753 +"attr: tech-c mandatory, multiple, lookup\n"
1756 +"attr: domain syntax(dns_name), mandatory, single, key\n"
1757 +"attr: sub-dom optional, multiple, lookup\n"
1758 +"attr: dom-net optional, multiple\n"
1759 +"attr: zone-c mandatory, multiple, lookup\n"
1760 +"attr: nserver optional, multiple, lookup\n"
1761 +"attr: mnt-lower syntax(ListOfrpsl_word), optional, multiple " CMN_ATTRS "\n"
1762 +"attr: descr mandatory, multiple\n"
1763 +"attr: mnt-by syntax(list of rpsl_word), optional, multiple, lookup\n"
1764 +"attr: admin-c mandatory, multiple, lookup\n"
1765 +"attr: tech-c mandatory, multiple, lookup\n"
1767 +"class: limerick\n"
1768 +"attr: limerick mandatory, single, key\n"
1769 +"attr: text mandatory, multiple\n"
1770 +"attr: author mandatory, multiple, lookup " CMN_ATTRS "\n"
1771 +"attr: descr optional, multiple\n"
1772 +"attr: mnt-by syntax(list of rpsl_word), mandatory, multiple, lookup\n"
1773 +"attr: admin-c mandatory, multiple, lookup\n"
1775 +"class: as-block\n"
1776 +"attr: as-block syntax(union as_number, range of as_number), mandatory, single, key\n"
1777 +"attr: mnt-lower syntax(ListOfrpsl_word), optional, multiple " CMN_ATTRS "\n"
1778 +"attr: descr mandatory, multiple\n"
1779 +"attr: mnt-by syntax(list of rpsl_word), optional, multiple, lookup\n"
1780 +"attr: admin-c mandatory, multiple, lookup\n"
1781 +"attr: tech-c mandatory, multiple, lookup\n"
1783 +"class: key-cert\n"
1784 +"attr: key-cert mandatory, single, key, syntax(rpsl_word)\n"
1785 +"attr: method mandatory, single, syntax(rpsl_word)\n"
1786 +"attr: owner mandatory, multiple\n"
1787 +"attr: fingerpr mandatory, single\n"
1788 +"attr: certif mandatory, single\n"
1789 +"attr: remarks optional, multiple\n"
1790 +"attr: source mandatory, single, lookup, syntax(rpsl_word)\n"
1791 +"attr: changed optional, multiple\n"
1792 +"attr: deleted optional, single, deleted\n"
1793 +"attr: mnt-by mandatory, multiple, lookup, syntax(list of rpsl_word)\n"
1794 +"attr: notify optional, multiple, syntax(email)\n"
1797 +"attr: peval syntax(special,filter), optional, single\n"
1799 +"class: repository\n"
1800 +"attr: repository mandatory, single, key, syntax(rpsl_word)\n"
1801 +"attr: query-address mandatory, multiple\n"
1802 +"attr: response-auth-type mandatory, multiple\n"
1803 +"attr: submit-address mandatory, multiple\n"
1804 +"attr: submit-auth-type mandatory, multiple\n"
1805 +"attr: repository-cert mandatory, multiple\n"
1806 +"attr: expire mandatory, single\n"
1807 +"attr: heartbeat-interval mandatory, single\n"
1808 +"attr: descr optional, multiple\n"
1809 +"attr: admin-c mandatory, multiple, lookup\n"
1810 +"attr: tech-c mandatory, multiple, lookup\n"
1811 +"attr: mnt-by mandatory, multiple, lookup " CMN_ATTRS "\n"
1814 void Schema::addClass(AttrClass *clss) {
1815 classes[lastClass++] = clss;
1816 --- IRRToolSet-4.7.3/src/aoe/aoe.hh.orig Tue Apr 9 13:48:46 2002
1817 +++ IRRToolSet-4.7.3/src/aoe/aoe.hh Wed Jul 9 09:54:31 2003
1819 class ListPeer : public TclCommand
1822 - virtual int command(int argc, char *argv[]);
1823 + virtual int command(int argc, const char *argv[]);
1826 int updateWindowTitle(TclApplication *pcApp, int iCategory,
1828 class LoadBgpDump : public TclCommand
1831 - virtual int command(int argc, char *argv[]);
1832 + virtual int command(int argc, const char *argv[]);
1835 LoadBgpDump(char *pzcName) : TclCommand(pzcName) {}
1837 class UpdatePolicy : public TclCommand
1840 - virtual int command(int argc, char *argv[]);
1841 + virtual int command(int argc, const char *argv[]);
1846 class EditPolicyText : public TclCommand
1849 - virtual int command(int argc, char *argv[]);
1850 + virtual int command(int argc, const char *argv[]);
1853 EditPolicyText(char *pzcName) : TclCommand(pzcName) {}
1855 class ShowPolicyText : public TclCommand
1858 - virtual int command(int argc, char *argv[]);
1859 + virtual int command(int argc, const char *argv[]);
1862 ShowPolicyText(char *pzcName) : TclCommand(pzcName) {}
1864 class FileOpen : public TclCommand
1867 - virtual int command(int argc, char *argv[]);
1868 + virtual int command(int argc, const char *argv[]);
1871 FileOpen(char *pzcName) : TclCommand(pzcName) {}
1873 class FileSave : public TclCommand
1876 - virtual int command(int argc, char *argv[]);
1877 + virtual int command(int argc, const char *argv[]);
1880 FileSave(char *pzcName) : TclCommand(pzcName) {}
1882 class ListSave : public TclCommand // katie@ripe.net for peers save
1885 - virtual int command(int argc, char *argv[]);
1886 + virtual int command(int argc, const char *argv[]);
1889 ListSave(char *pzcName) : TclCommand(pzcName) {}
1891 class FileRevert : public TclCommand
1894 - virtual int command(int argc, char *argv[]);
1895 + virtual int command(int argc, const char *argv[]);
1898 FileRevert(char *pzcName) : TclCommand(pzcName) {}
1900 class FilePrint : public TclCommand
1903 - virtual int command(int argc, char *argv[]);
1904 + virtual int command(int argc, const char *argv[]);
1907 FilePrint(char *pzcName) : TclCommand(pzcName) {}
1909 class AddPeer : public TclCommand
1912 - virtual int command(int argc, char *argv[]);
1913 + virtual int command(int argc, const char *argv[]);
1916 AddPeer(char *pzcName) : TclCommand(pzcName) {}
1918 class DeletePeer: public TclCommand
1921 - virtual int command(int argc, char *argv[]);
1922 + virtual int command(int argc, const char *argv[]);
1925 DeletePeer(char *pzcName) : TclCommand(pzcName) {}
1927 class CreatePolicyTemplateMenu : public TclCommand
1930 - virtual int command(int argc, char *argv[]);
1931 + virtual int command(int argc, const char *argv[]);
1934 CreatePolicyTemplateMenu(char *pzcName) : TclCommand(pzcName) {}
1935 --- IRRToolSet-4.7.3/src/aoe/aoe.cc.orig Tue Apr 9 13:48:46 2002
1936 +++ IRRToolSet-4.7.3/src/aoe/aoe.cc Wed Jul 9 09:56:04 2003
1938 int ListPeer::updateWindowTitle(TclApplication *pcTcl, int iCategory,
1941 - char *title, *dummy = "Shouldn't happen!";
1942 + const char *title, *dummy = "Shouldn't happen!";
1943 char pzcBuffer[128];
1944 AoeApplication *pcApp = (AoeApplication *)pcTcl;
1948 sprintf(pzcBuffer, "PolicyTemplate(%d,import)", iCategory - 4);
1950 - << substitute(pcApp->getVar(pzcBuffer), pzcMyAS, pzcPeerAS)
1951 + << substitute((char*)pcApp->getVar(pzcBuffer), pzcMyAS, pzcPeerAS)
1957 sprintf(pzcBuffer, "PolicyTemplate(%d,export)", iCategory - 4);
1959 - << substitute(pcApp->getVar(pzcBuffer), pzcMyAS, pzcPeerAS)
1960 + << substitute((char*)pcApp->getVar(pzcBuffer), pzcMyAS, pzcPeerAS)
1963 // Fill the text widget
1968 -int ListPeer::command(int argc, char *argv[])
1969 +int ListPeer::command(int argc, const char *argv[])
1971 if (argc != 2) return TCL_ERROR;
1972 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
1977 -int LoadBgpDump::command(int argc, char *argv[])
1978 +int LoadBgpDump::command(int argc, const char *argv[])
1980 if (argc != 2) return TCL_ERROR;
1981 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
1982 @@ -748,10 +748,10 @@
1986 -int UpdatePolicy::command(int argc, char *argv[])
1987 +int UpdatePolicy::command(int argc, const char *argv[])
1989 if (argc != 3) return TCL_ERROR;
1990 - char *pzcOption = argv[1];
1991 + const char *pzcOption = argv[1];
1992 int iTarget = atoi(argv[2]);
1993 int iResult = TCL_ERROR;
1994 if (strcmp(pzcOption, "append") == 0)
1999 -int EditPolicyText::command(int argc, char *argv[])
2000 +int EditPolicyText::command(int argc, const char *argv[])
2002 if (argc != 1) return TCL_ERROR;
2003 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
2008 -int ShowPolicyText::command(int argc, char *argv[])
2009 +int ShowPolicyText::command(int argc, const char *argv[])
2011 if (argc != 1) return TCL_ERROR;
2012 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
2017 -int FileOpen::command(int argc, char *argv[])
2018 +int FileOpen::command(int argc, const char *argv[])
2020 if (argc != 2) return TCL_ERROR;
2021 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
2026 -int FileSave::command(int argc, char *argv[])
2027 +int FileSave::command(int argc, const char *argv[])
2029 if (argc != 2) return TCL_ERROR;
2030 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
2034 // by katie@ripe.net for saving the peer list with status
2035 -int ListSave::command(int argc, char *argv[])
2036 +int ListSave::command(int argc, const char *argv[])
2038 if (argc != 2) return TCL_ERROR;
2039 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
2044 -int FileRevert::command(int argc, char *argv[])
2045 +int FileRevert::command(int argc, const char *argv[])
2047 if (argc != 1) return TCL_ERROR;
2048 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
2049 @@ -945,10 +945,10 @@
2053 -int FilePrint::command(int argc, char *argv[])
2054 +int FilePrint::command(int argc, const char *argv[])
2056 if (argc != 2) return TCL_ERROR;
2057 - char *pzcCommand = argv[1];
2058 + const char *pzcCommand = argv[1];
2059 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
2060 const char *pzcText;
2066 -int AddPeer::command(int argc, char *argv[])
2067 +int AddPeer::command(int argc, const char *argv[])
2069 if (argc != 2) return TCL_ERROR;
2070 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
2075 -int DeletePeer::command(int argc, char *argv[])
2076 +int DeletePeer::command(int argc, const char *argv[])
2078 if (argc != 2) return TCL_ERROR;
2079 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
2080 @@ -1041,7 +1041,7 @@
2084 -int CreatePolicyTemplateMenu::command(int argc, char *argv[])
2085 +int CreatePolicyTemplateMenu::command(int argc, const char *argv[])
2087 if (argc != 1) return TCL_ERROR;
2088 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
2089 @@ -1049,14 +1049,14 @@
2090 for (int i = pcApp->pcCategoryButton->getSize(); i > 4; i--)
2091 pcApp->pcCategoryButton->del(i);
2093 - char *pzcTotal = pcApp->getVar("PolicyTemplate(Total)");
2094 + const char *pzcTotal = pcApp->getVar("PolicyTemplate(Total)");
2097 for (int i = 0; i < atoi(pzcTotal); i++)
2099 char pzcBuffer[256];
2100 sprintf(pzcBuffer, "PolicyTemplate(%d,Description)", i);
2101 - if (!pcApp->pcCategoryButton->add(pcApp->getVar(pzcBuffer),
2102 + if (!pcApp->pcCategoryButton->add((char*)pcApp->getVar(pzcBuffer),
2103 "listPeer [.body.aspeer.listbox.list curselection]"))