Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/ppp merge conflicts



details:   https://anonhg.NetBSD.org/src/rev/d51967f9b499
branches:  trunk
changeset: 958524:d51967f9b499
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jan 09 16:39:28 2021 +0000

description:
merge conflicts

diffstat:

 external/bsd/ppp/dist/.gitignore                |     7 -
 external/bsd/ppp/dist/README.pppoe              |    93 -
 external/bsd/ppp/dist/chat/.gitignore           |     1 -
 external/bsd/ppp/dist/chat/chat.c               |   204 +--
 external/bsd/ppp/dist/pppd/.gitignore           |     1 -
 external/bsd/ppp/dist/pppd/auth.c               |   708 ++++++++++---
 external/bsd/ppp/dist/pppd/cbcp.c               |    84 +-
 external/bsd/ppp/dist/pppd/ccp.c                |   169 +-
 external/bsd/ppp/dist/pppd/ccp.h                |     4 +-
 external/bsd/ppp/dist/pppd/chap-new.c           |    81 +-
 external/bsd/ppp/dist/pppd/chap-new.h           |     5 +-
 external/bsd/ppp/dist/pppd/chap_ms.c            |    28 +-
 external/bsd/ppp/dist/pppd/chap_ms.h            |    12 +-
 external/bsd/ppp/dist/pppd/demand.c             |    32 +-
 external/bsd/ppp/dist/pppd/eap.c                |  1205 ++++++++++++++++++++--
 external/bsd/ppp/dist/pppd/eap.h                |    56 +-
 external/bsd/ppp/dist/pppd/ecp.c                |    41 +-
 external/bsd/ppp/dist/pppd/eui64.c              |    13 +-
 external/bsd/ppp/dist/pppd/eui64.h              |     7 +-
 external/bsd/ppp/dist/pppd/fsm.c                |   101 +-
 external/bsd/ppp/dist/pppd/fsm.h                |    54 +-
 external/bsd/ppp/dist/pppd/ipcp.c               |   265 ++--
 external/bsd/ppp/dist/pppd/ipcp.h               |     7 +-
 external/bsd/ppp/dist/pppd/ipv6cp.c             |   248 ++--
 external/bsd/ppp/dist/pppd/ipv6cp.h             |     8 +-
 external/bsd/ppp/dist/pppd/ipxcp.c              |   166 +--
 external/bsd/ppp/dist/pppd/ipxcp.h              |     4 +-
 external/bsd/ppp/dist/pppd/lcp.c                |   213 +--
 external/bsd/ppp/dist/pppd/lcp.h                |    14 +-
 external/bsd/ppp/dist/pppd/magic.c              |    24 +-
 external/bsd/ppp/dist/pppd/magic.h              |    10 +-
 external/bsd/ppp/dist/pppd/main.c               |   323 ++---
 external/bsd/ppp/dist/pppd/multilink.c          |    54 +-
 external/bsd/ppp/dist/pppd/options.c            |   233 ++--
 external/bsd/ppp/dist/pppd/patchlevel.h         |     6 +-
 external/bsd/ppp/dist/pppd/pathnames.h          |    11 +-
 external/bsd/ppp/dist/pppd/plugins/passprompt.c |   110 --
 external/bsd/ppp/dist/pppd/plugins/winbind.c    |   669 ------------
 external/bsd/ppp/dist/pppd/pppcrypt.c           |    49 +-
 external/bsd/ppp/dist/pppd/pppcrypt.h           |     8 +-
 external/bsd/ppp/dist/pppd/pppd.8               |   152 ++-
 external/bsd/ppp/dist/pppd/pppd.h               |   460 ++++----
 external/bsd/ppp/dist/pppd/session.c            |    20 +-
 external/bsd/ppp/dist/pppd/tty.c                |   126 +-
 external/bsd/ppp/dist/pppd/upap.c               |   100 +-
 external/bsd/ppp/dist/pppd/upap.h               |     8 +-
 external/bsd/ppp/dist/pppd/utils.c              |   164 +--
 external/bsd/ppp/dist/pppdump/bsd-comp.c        |    67 +-
 external/bsd/ppp/dist/pppdump/deflate.c         |    56 +-
 external/bsd/ppp/dist/pppstats/pppstats.c       |    64 +-
 external/bsd/ppp/usr.sbin/pppd/sys-bsd.c        |   197 ++-
 51 files changed, 3409 insertions(+), 3333 deletions(-)

diffs (truncated from 12699 to 300 lines):

diff -r befcbe4903c8 -r d51967f9b499 external/bsd/ppp/dist/.gitignore
--- a/external/bsd/ppp/dist/.gitignore  Sat Jan 09 16:37:35 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-*.orig
-*~
-*.o
-*.so
-*.a
-*.cat8
-Makefile
diff -r befcbe4903c8 -r d51967f9b499 external/bsd/ppp/dist/README.pppoe
--- a/external/bsd/ppp/dist/README.pppoe        Sat Jan 09 16:37:35 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-               PPPoE Support
-               -------------
-
-               Michal Ostrowski
-               8 August 2001
-
-               for ppp-2.4.2
-               Updated for ppp-2.4.5 by Paul Mackerras, Sep 08
-
-1. Introduction
----------------
-
-This document describes the support for PPP over Ethernet (PPPoE)
-included with this package.  It is assumed that the reader is
-familiar with Linux PPP (as it pertains to tty/modem-based
-connections).  In particular, users of PPP in the Linux 2.2 series
-kernels should ensure they are familiar with the changes to the PPP
-implementation in the 2.4 series kernels before attempting to use
-PPPoE features.
-
-If you are not familiar with PPP, I recommend looking at other
-packages which include end-user configuration tools, such as Roaring
-Penguin (http://www.roaringpenguin.com/pppoe).
-
-PPPoE is a protocol typically used by *DSL providers to manage IP
-addresses and authenticate users.  Essentially, PPPoE provides for a
-PPP connection to be established not over a physical serial-line or
-modem, but over a logical connection between two unique MAC-addresses
-on an ethernet network.  Once the PPPoE layer discovers the end-points
-to be used in the link and negotiates it, frames may be sent to and
-received from the PPPoE layer just as if the link was a serial line
-(or that is how it's supposed to be).
-
-With this in mind, the goal of the implementation of PPPoE support in
-Linux is to allow users to simply specify that the device they intend
-to use for the PPP connection is an ethernet device (e.g. "eth0") and
-the rest of the system should function as usual.
-
-2. Using PPPoE
---------------
-
-This section is a quick guide for getting PPPoE working, to allow one
-to connect to their ISP who is providing PPPoE based services.
-
-1.  Enable "Prompt for development and/or incomplete code/drivers" and
-    "PPP over Ethernet" in your kernel configuration.  Most distributions
-    will include the kernel PPPoE module by default.
-
-2.  Compile and install your kernel.
-
-3.  Install the ppp package.
-
-4.  Add the following line to /etc/ppp/options:
-
-    plugin rp-pppoe.so
-
-    The effect of this line is simply to make "eth0", "eth1",
-    ....,"ethx" all valid device names for pppd (just like ttyS0,
-    ttyS1).
-
-5.  Add the necessary authentication options to your pppd
-    configuration (i.e. PAP/CHAP information).  If you wish to
-    maintain seperate configurations for different devices you may
-    place configuration options in device-specific configuration
-    files: /etc/ppp/options.devname (devname=ttyS0, ttyS1, eth0, eth1
-    or any other valid device name).
-
-6.  Invoke pppd with the appropriate device name: e.g. "pppd eth0"
-
-
-Do not include any compression or flow control options in your PPPoE
-configuration.  They will be ignored.
-
-Again, here it is assumed that the reader is familiar with the general
-process of configuring PPP.  The steps outlined here refer only to the
-steps and configuration options which are PPPoE specific, and it is
-assumed that the reader will also configure other aspects of the system
-(e.g. PAP authentication parameters).
-
-3.  Advanced Functionality
---------------------------
-
-For more advanced functionality (such as providing PPPoE services) and
-user configuration tools, look to the Roaring Penguin PPPoE software
-package (http://www.roaringpenguin.com/pppoe).
-
-4.  Credits
------------
-
-The PPPoE plugin included in this package is a component of the
-Roaring Penguin PPPoE package, included in this package courtesy of
-Roaring Penguin Software. (http://www.roaringpenguin.com).
-
diff -r befcbe4903c8 -r d51967f9b499 external/bsd/ppp/dist/chat/.gitignore
--- a/external/bsd/ppp/dist/chat/.gitignore     Sat Jan 09 16:37:35 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-chat
diff -r befcbe4903c8 -r d51967f9b499 external/bsd/ppp/dist/chat/chat.c
--- a/external/bsd/ppp/dist/chat/chat.c Sat Jan 09 16:37:35 2021 +0000
+++ b/external/bsd/ppp/dist/chat/chat.c Sat Jan 09 16:39:28 2021 +0000
@@ -82,17 +82,8 @@
  *
  */
 
-#ifndef __STDC__
-#define const
-#endif
 #include <sys/cdefs.h>
-#if 0
-#ifndef lint
-static const char rcsid[] = "Id: chat.c,v 1.30 2004/01/17 05:47:55 carlsonj Exp ";
-#endif
-#else
 __RCSID("NetBSD: chat.c,v 1.2 2013/11/28 22:33:42 christos Exp ");
-#endif
 
 #include <stdio.h>
 #include <ctype.h>
@@ -106,6 +97,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <syslog.h>
+#include <stdarg.h>
 
 #ifndef TERMIO
 #undef TERMIOS
@@ -125,20 +117,6 @@
 #define SIGTYPE void
 #endif
 
-#undef __P
-#undef __V
-
-#ifdef __STDC__
-#include <stdarg.h>
-#define __V(x) x
-#define __P(x) x
-#else
-#include <varargs.h>
-#define __V(x) (va_alist) va_dcl
-#define __P(x) ()
-#define const
-#endif
-
 #ifndef O_NONBLOCK
 #define O_NONBLOCK     O_NDELAY
 #endif
@@ -202,43 +180,41 @@
 
 int say_next = 0, hup_next = 0;
 
-void *dup_mem __P((void *b, size_t c));
-void *copy_of __P((char *s));
-char *grow __P((char *s, char **p, size_t len));
-void usage __P((void));
-void msgf __P((const char *fmt, ...));
-void fatal __P((int code, const char *fmt, ...));
-SIGTYPE sigalrm __P((int signo));
-SIGTYPE sigint __P((int signo));
-SIGTYPE sigterm __P((int signo));
-SIGTYPE sighup __P((int signo));
-void unalarm __P((void));
-void init __P((void));
-void set_tty_parameters __P((void));
-void echo_stderr __P((int));
-void break_sequence __P((void));
-void terminate __P((int status));
-void do_file __P((char *chat_file));
-int  get_string __P((char *string));
-int  put_string __P((char *s));
-int  write_char __P((int c));
-int  put_char __P((int c));
-int  get_char __P((void));
-void chat_send __P((char *s));
-char *character __P((int c));
-void chat_expect __P((char *s));
-char *clean __P((char *s, int sending));
-void break_sequence __P((void));
-void terminate __P((int status));
-void pack_array __P((char **array, int end));
-char *expect_strtok __P((char *, char *));
-int vfmtmsg __P((char *, int, const char *, va_list)); /* vsprintf++ */
+void *dup_mem (void *b, size_t c);
+void *copy_of (char *s);
+char *grow (char *s, char **p, size_t len);
+void usage (void);
+void msgf (const char *fmt, ...);
+void fatal (int code, const char *fmt, ...);
+SIGTYPE sigalrm (int signo);
+SIGTYPE sigint (int signo);
+SIGTYPE sigterm (int signo);
+SIGTYPE sighup (int signo);
+void unalarm (void);
+void init (void);
+void set_tty_parameters (void);
+void echo_stderr (int);
+void break_sequence (void);
+void terminate (int status);
+void do_file (char *chat_file);
+int  get_string (register char *string);
+int  put_string (register char *s);
+int  write_char (int c);
+int  put_char (int c);
+int  get_char (void);
+void chat_send (register char *s);
+char *character (int c);
+void chat_expect (register char *s);
+char *clean (register char *s, int sending);
+void break_sequence (void);
+void terminate (int status);
+void pack_array (char **array, int end);
+char *expect_strtok (char *, char *);
+int vfmtmsg (char *, int, const char *, va_list);      /* vsprintf++ */
 
-int main __P((int, char *[]));
+int main (int, char *[]);
 
-void *dup_mem(b, c)
-void *b;
-size_t c;
+void *dup_mem(void *b, size_t c)
 {
     void *ans = malloc (c);
     if (!ans)
@@ -248,17 +224,13 @@
     return ans;
 }
 
-void *copy_of (s)
-char *s;
+void *copy_of (char *s)
 {
     return dup_mem (s, strlen (s) + 1);
 }
 
 /* grow a char buffer and keep a pointer offset */
-char *grow(s, p, len)
-char *s;
-char **p;
-size_t len;
+char *grow(char *s, char **p, size_t len)
 {
     size_t l = *p - s;         /* save p as distance into s */
 
@@ -277,9 +249,7 @@
  *     Perform a UUCP-dialer-like chat script on stdin and stdout.
  */
 int
-main(argc, argv)
-     int argc;
-     char **argv;
+main(int argc, char **argv)
 {
     int option;
     int i;
@@ -405,8 +375,7 @@
  *  Process a chat script when read from a file.
  */
 
-void do_file (chat_file)
-char *chat_file;
+void do_file (char *chat_file)
 {
     int linect, sendflg;
     char *sp, *arg, quote;
@@ -474,7 +443,7 @@
 /*
  *     We got an error parsing the command line.
  */
-void usage()
+void usage(void)
 {
     fprintf(stderr, "\
 Usage: %s [-e] [-E] [-v] [-V] [-t timeout] [-r report-file]\n\
@@ -487,17 +456,11 @@
 /*
  * Send a message to syslog and/or stderr.
  */
-void msgf __V((const char *fmt, ...))
+void msgf(const char *fmt, ...)
 {
     va_list args;
 
-#ifdef __STDC__



Home | Main Index | Thread Index | Old Index