d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change PPPoE occurences to pppoe. Not JUST a cosmeting change.

Browse Source 
some occurrances needed to be the same as the filenmnae which was pppoe
 not PPPoE.
This commit is contained in:
Julian Elischer 1999-10-27 11:29:51 +00:00
parent 77ba2fa135
commit 8876b55d7b
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
sys/netgraph/ng_pppoe.c
View File

@ -65,31 +65,31 @@
* sample node. These methods define the netgraph 'type'. * sample node. These methods define the netgraph 'type'.
*/ */
static int ng_PPPoE_constructor(node_p *node); static int ng_pppoe_constructor(node_p *node);
static int ng_PPPoE_rcvmsg(node_p node, struct ng_mesg *msg, static int ng_pppoe_rcvmsg(node_p node, struct ng_mesg *msg,
const char *retaddr, struct ng_mesg **resp); const char *retaddr, struct ng_mesg **resp);
static int ng_PPPoE_rmnode(node_p node); static int ng_pppoe_rmnode(node_p node);
static int ng_PPPoE_newhook(node_p node, hook_p hook, const char *name); static int ng_pppoe_newhook(node_p node, hook_p hook, const char *name);
static int ng_PPPoE_connect(hook_p hook); static int ng_pppoe_connect(hook_p hook);
static int ng_PPPoE_rcvdata(hook_p hook, struct mbuf *m, meta_p meta); static int ng_pppoe_rcvdata(hook_p hook, struct mbuf *m, meta_p meta);
static int ng_PPPoE_disconnect(hook_p hook); static int ng_pppoe_disconnect(hook_p hook);
/* Netgraph node type descriptor */ /* Netgraph node type descriptor */
static struct ng_type typestruct = { static struct ng_type typestruct = {
NG_VERSION, NG_VERSION,
NG_PPPOE_NODE_TYPE, NG_PPPOE_NODE_TYPE,
NULL, NULL,
ng_PPPoE_constructor, ng_pppoe_constructor,
ng_PPPoE_rcvmsg, ng_pppoe_rcvmsg,
ng_PPPoE_rmnode, ng_pppoe_rmnode,
ng_PPPoE_newhook, ng_pppoe_newhook,
NULL, NULL,
ng_PPPoE_connect, ng_pppoe_connect,
ng_PPPoE_rcvdata, ng_pppoe_rcvdata,
ng_PPPoE_rcvdata, ng_pppoe_rcvdata,
ng_PPPoE_disconnect ng_pppoe_disconnect
}; };
NETGRAPH_INIT(PPPoE, &typestruct); NETGRAPH_INIT(pppoe, &typestruct);
/* /*
* States for the session state machine. * States for the session state machine.
@ -463,7 +463,7 @@ AAA
* to creatednodes that depend on hardware (unless you can add the hardware :) * to creatednodes that depend on hardware (unless you can add the hardware :)
*/ */
static int static int
ng_PPPoE_constructor(node_p *nodep) ng_pppoe_constructor(node_p *nodep)
{ {
priv_p privdata; priv_p privdata;
int error; int error;
@ -496,7 +496,7 @@ AAA
* debug: copies of data sent out here (when I write the code). * debug: copies of data sent out here (when I write the code).
*/ */
static int static int
ng_PPPoE_newhook(node_p node, hook_p hook, const char *name) ng_pppoe_newhook(node_p node, hook_p hook, const char *name)
{ {
const priv_p privp = node->private; const priv_p privp = node->private;
sessp sp; sessp sp;
@ -533,11 +533,11 @@ AAA
* Always free the message. * Always free the message.
*/ */
static int static int
ng_PPPoE_rcvmsg(node_p node, ng_pppoe_rcvmsg(node_p node,
struct ng_mesg *msg, const char *retaddr, struct ng_mesg **rptr) struct ng_mesg *msg, const char *retaddr, struct ng_mesg **rptr)
{ {
priv_p privp = node->private; priv_p privp = node->private;
struct ngPPPoE_init_data *ourmsg = NULL; struct ngpppoe_init_data *ourmsg = NULL;
struct ng_mesg *resp = NULL; struct ng_mesg *resp = NULL;
int error = 0; int error = 0;
hook_p hook = NULL; hook_p hook = NULL;
@ -552,11 +552,11 @@ AAA
case NGM_PPPOE_CONNECT: case NGM_PPPOE_CONNECT:
case NGM_PPPOE_LISTEN: case NGM_PPPOE_LISTEN:
case NGM_PPPOE_OFFER: case NGM_PPPOE_OFFER:
ourmsg = (struct ngPPPoE_init_data *)msg->data; ourmsg = (struct ngpppoe_init_data *)msg->data;
if (( sizeof(*ourmsg) > msg->header.arglen) if (( sizeof(*ourmsg) > msg->header.arglen)
|| ((sizeof(*ourmsg) + ourmsg->data_len) || ((sizeof(*ourmsg) + ourmsg->data_len)
> msg->header.arglen)) { > msg->header.arglen)) {
printf("PPPoE_rcvmsg: bad arg size"); printf("pppoe_rcvmsg: bad arg size");
LEAVE(EMSGSIZE); LEAVE(EMSGSIZE);
} }
if (ourmsg->data_len > PPPOE_SERVICE_NAME_SIZE) { if (ourmsg->data_len > PPPOE_SERVICE_NAME_SIZE) {
@ -626,13 +626,13 @@ AAA
switch (msg->header.cmd) { switch (msg->header.cmd) {
case NGM_PPPOE_GET_STATUS: case NGM_PPPOE_GET_STATUS:
{ {
struct ngPPPoEstat *stats; struct ngpppoestat *stats;
NG_MKRESPONSE(resp, msg, sizeof(*stats), M_NOWAIT); NG_MKRESPONSE(resp, msg, sizeof(*stats), M_NOWAIT);
if (!resp) { if (!resp) {
LEAVE(ENOMEM); LEAVE(ENOMEM);
} }
stats = (struct ngPPPoEstat *) resp->data; stats = (struct ngpppoestat *) resp->data;
stats->packets_in = privp->packets_in; stats->packets_in = privp->packets_in;
stats->packets_out = privp->packets_out; stats->packets_out = privp->packets_out;
break; break;
@ -758,7 +758,7 @@ AAA
* if we use up this data or abort we must free BOTH of these. * if we use up this data or abort we must free BOTH of these.
*/ */
static int static int
ng_PPPoE_rcvdata(hook_p hook, struct mbuf *m, meta_p meta) ng_pppoe_rcvdata(hook_p hook, struct mbuf *m, meta_p meta)
{ {
node_p node = hook->node; node_p node = hook->node;
const priv_p privp = node->private; const priv_p privp = node->private;
@ -1216,7 +1216,7 @@ quit:
* we'd only remove our links and reset ourself. * we'd only remove our links and reset ourself.
*/ */
static int static int
ng_PPPoE_rmnode(node_p node) ng_pppoe_rmnode(node_p node)
{ {
const priv_p privdata = node->private; const priv_p privdata = node->private;
@ -1235,7 +1235,7 @@ AAA
* It gives us a chance to balk at the last minute. * It gives us a chance to balk at the last minute.
*/ */
static int static int
ng_PPPoE_connect(hook_p hook) ng_pppoe_connect(hook_p hook)
{ {
/* be really amiable and just say "YUP that's OK by me! " */ /* be really amiable and just say "YUP that's OK by me! " */
return (0); return (0);
@ -1248,7 +1248,7 @@ ng_PPPoE_connect(hook_p hook)
* For this type, removal of the last link destroys the node * For this type, removal of the last link destroys the node
*/ */
static int static int
ng_PPPoE_disconnect(hook_p hook) ng_pppoe_disconnect(hook_p hook)
{ {
node_p node = hook->node; node_p node = hook->node;
priv_p privp = node->private; priv_p privp = node->private;
@ -1460,12 +1460,12 @@ pppoe_send_event(sessp sp, enum cmd cmdid)
{ {
int error; int error;
struct ng_mesg *msg; struct ng_mesg *msg;
struct ngPPPoE_sts *sts; struct ngpppoe_sts *sts;
AAA AAA
NG_MKMESSAGE(msg, NGM_PPPOE_COOKIE, cmdid, NG_MKMESSAGE(msg, NGM_PPPOE_COOKIE, cmdid,
sizeof(struct ngPPPoE_sts), M_NOWAIT); sizeof(struct ngpppoe_sts), M_NOWAIT);
sts = (struct ngPPPoE_sts *)msg->data; sts = (struct ngpppoe_sts *)msg->data;
strncpy(sts->hook, sp->hook->name, NG_HOOKLEN + 1); strncpy(sts->hook, sp->hook->name, NG_HOOKLEN + 1);
error = ng_send_msg(sp->hook->node, msg, sp->creator, NULL); error = ng_send_msg(sp->hook->node, msg, sp->creator, NULL);
return (error); return (error);

18
sys/netgraph/ng_pppoe.h
View File

@ -47,7 +47,7 @@
* Netgraph hook constants etc. * Netgraph hook constants etc.
********************************************************************/ ********************************************************************/
/* Node type name. This should be unique among all netgraph node types */ /* Node type name. This should be unique among all netgraph node types */
#define NG_PPPOE_NODE_TYPE "PPPoE" #define NG_PPPOE_NODE_TYPE "pppoe"
#define NGM_PPPOE_COOKIE 939032003 #define NGM_PPPOE_COOKIE 939032003
@ -81,7 +81,7 @@ enum cmd {
* Structures passed in the various netgraph command messages. * Structures passed in the various netgraph command messages.
***********************/ ***********************/
/* This structure is returned by the NGM_PPPOE_GET_STATUS command */ /* This structure is returned by the NGM_PPPOE_GET_STATUS command */
struct ngPPPoEstat { struct ngpppoestat {
u_int packets_in; /* packets in from downstream */ u_int packets_in; /* packets in from downstream */
u_int packets_out; /* packets out towards downstream */ u_int packets_out; /* packets out towards downstream */
}; };
@ -104,7 +104,7 @@ struct ngPPPoEstat {
* named hook. The session will then issue the appropriate PADO * named hook. The session will then issue the appropriate PADO
* and begin negotiation. * and begin negotiation.
*/ */
struct ngPPPoE_init_data { struct ngpppoe_init_data {
char hook[NG_HOOKLEN + 1]; /* hook to monitor on */ char hook[NG_HOOKLEN + 1]; /* hook to monitor on */
u_int16_t data_len; /* Length of the service name */ u_int16_t data_len; /* Length of the service name */
char data[0]; /* init data goes here */ char data[0]; /* init data goes here */
@ -115,13 +115,13 @@ struct ngPPPoE_init_data {
* (to report which hook has failed or connected). The message is sent * (to report which hook has failed or connected). The message is sent
* to whoever requested the connection. (close may use this too). * to whoever requested the connection. (close may use this too).
*/ */
struct ngPPPoE_sts { struct ngpppoe_sts {
char hook[NG_HOOKLEN + 1]; /* hook associated with event session */ char hook[NG_HOOKLEN + 1]; /* hook associated with event session */
}; };
/******************************************************************** /********************************************************************
* Constants and definitions specific to PPPoE * Constants and definitions specific to pppoe
********************************************************************/ ********************************************************************/
#define PPPOE_TIMEOUT_LIMIT 64 #define PPPOE_TIMEOUT_LIMIT 64
@ -147,8 +147,8 @@ struct ngPPPoE_sts {
#define PTT_SYS_ERR (0x0202) #define PTT_SYS_ERR (0x0202)
#define PTT_GEN_ERR (0x0203) #define PTT_GEN_ERR (0x0203)
#define ETHERTYPE_PPPOE_DISC 0x8863 /* PPPoE discovery packets */ #define ETHERTYPE_PPPOE_DISC 0x8863 /* pppoe discovery packets */
#define ETHERTYPE_PPPOE_SESS 0x8864 /* PPPoE session packets */ #define ETHERTYPE_PPPOE_SESS 0x8864 /* pppoe session packets */
#else #else
#define PTT_EOL (0x0000) #define PTT_EOL (0x0000)
#define PTT_SRV_NAME (0x0101) #define PTT_SRV_NAME (0x0101)
@ -161,8 +161,8 @@ struct ngPPPoE_sts {
#define PTT_SYS_ERR (0x0202) #define PTT_SYS_ERR (0x0202)
#define PTT_GEN_ERR (0x0302) #define PTT_GEN_ERR (0x0302)
#define ETHERTYPE_PPPOE_DISC 0x6388 /* PPPoE discovery packets */ #define ETHERTYPE_PPPOE_DISC 0x6388 /* pppoe discovery packets */
#define ETHERTYPE_PPPOE_SESS 0x6488 /* PPPoE session packets */ #define ETHERTYPE_PPPOE_SESS 0x6488 /* pppoe session packets */
#endif #endif
struct pppoe_tag { struct pppoe_tag {