patch-pppd_ipxcp_c 3.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798
  1. --- ppp-2.4.5.orig/pppd/ipxcp.c 2009-11-16 23:26:07.000000000 +0100
  2. +++ ppp-2.4.5/pppd/ipxcp.c 2014-03-17 16:13:13.000000000 +0100
  3. @@ -78,17 +78,17 @@ ipxcp_options ipxcp_hisoptions[NUM_PPP];
  4. /*
  5. * Callbacks for fsm code. (CI = Configuration Information)
  6. */
  7. -static void ipxcp_resetci __P((fsm *)); /* Reset our CI */
  8. -static int ipxcp_cilen __P((fsm *)); /* Return length of our CI */
  9. -static void ipxcp_addci __P((fsm *, u_char *, int *)); /* Add our CI */
  10. -static int ipxcp_ackci __P((fsm *, u_char *, int)); /* Peer ack'd our CI */
  11. -static int ipxcp_nakci __P((fsm *, u_char *, int, int));/* Peer nak'd our CI */
  12. -static int ipxcp_rejci __P((fsm *, u_char *, int)); /* Peer rej'd our CI */
  13. -static int ipxcp_reqci __P((fsm *, u_char *, int *, int)); /* Rcv CI */
  14. -static void ipxcp_up __P((fsm *)); /* We're UP */
  15. -static void ipxcp_down __P((fsm *)); /* We're DOWN */
  16. -static void ipxcp_finished __P((fsm *)); /* Don't need lower layer */
  17. -static void ipxcp_script __P((fsm *, char *)); /* Run an up/down script */
  18. +static void ipxcp_resetci (fsm *); /* Reset our CI */
  19. +static int ipxcp_cilen (fsm *); /* Return length of our CI */
  20. +static void ipxcp_addci (fsm *, u_char *, int *); /* Add our CI */
  21. +static int ipxcp_ackci (fsm *, u_char *, int); /* Peer ack'd our CI */
  22. +static int ipxcp_nakci (fsm *, u_char *, int, int);/* Peer nak'd our CI */
  23. +static int ipxcp_rejci (fsm *, u_char *, int); /* Peer rej'd our CI */
  24. +static int ipxcp_reqci (fsm *, u_char *, int *, int); /* Rcv CI */
  25. +static void ipxcp_up (fsm *); /* We're UP */
  26. +static void ipxcp_down (fsm *); /* We're DOWN */
  27. +static void ipxcp_finished (fsm *); /* Don't need lower layer */
  28. +static void ipxcp_script (fsm *, char *); /* Run an up/down script */
  29. fsm ipxcp_fsm[NUM_PPP]; /* IPXCP fsm structure */
  30. @@ -113,10 +113,10 @@ static fsm_callbacks ipxcp_callbacks = {
  31. /*
  32. * Command-line options.
  33. */
  34. -static int setipxnode __P((char **));
  35. -static void printipxnode __P((option_t *,
  36. - void (*)(void *, char *, ...), void *));
  37. -static int setipxname __P((char **));
  38. +static int setipxnode (char **);
  39. +static void printipxnode (option_t *,
  40. + void (*)(void *, char *, ...), void *);
  41. +static int setipxname (char **);
  42. static option_t ipxcp_option_list[] = {
  43. { "ipx", o_bool, &ipxcp_protent.enabled_flag,
  44. @@ -170,15 +170,15 @@ static option_t ipxcp_option_list[] = {
  45. * Protocol entry points.
  46. */
  47. -static void ipxcp_init __P((int));
  48. -static void ipxcp_open __P((int));
  49. -static void ipxcp_close __P((int, char *));
  50. -static void ipxcp_lowerup __P((int));
  51. -static void ipxcp_lowerdown __P((int));
  52. -static void ipxcp_input __P((int, u_char *, int));
  53. -static void ipxcp_protrej __P((int));
  54. -static int ipxcp_printpkt __P((u_char *, int,
  55. - void (*) __P((void *, char *, ...)), void *));
  56. +static void ipxcp_init (int);
  57. +static void ipxcp_open (int);
  58. +static void ipxcp_close (int, char *);
  59. +static void ipxcp_lowerup (int);
  60. +static void ipxcp_lowerdown (int);
  61. +static void ipxcp_input (int, u_char *, int);
  62. +static void ipxcp_protrej (int);
  63. +static int ipxcp_printpkt (u_char *, int,
  64. + void (*) __P((void *, char *, ...)), void *);
  65. struct protent ipxcp_protent = {
  66. PPP_IPXCP,
  67. @@ -217,7 +217,7 @@ struct protent ipxcp_protent = {
  68. static int ipxcp_is_up;
  69. -static char *ipx_ntoa __P((u_int32_t));
  70. +static char *ipx_ntoa (u_int32_t);
  71. /* Used in printing the node number */
  72. #define NODE(base) base[0], base[1], base[2], base[3], base[4], base[5]
  73. @@ -323,7 +323,7 @@ setipxnode(argv)
  74. static void
  75. printipxnode(opt, printer, arg)
  76. option_t *opt;
  77. - void (*printer) __P((void *, char *, ...));
  78. + void (*printer) (void *, char *, ...);
  79. void *arg;
  80. {
  81. unsigned char *p;
  82. @@ -1473,7 +1473,7 @@ static int
  83. ipxcp_printpkt(p, plen, printer, arg)
  84. u_char *p;
  85. int plen;
  86. - void (*printer) __P((void *, char *, ...));
  87. + void (*printer) (void *, char *, ...);
  88. void *arg;
  89. {
  90. int code, id, len, olen;