Attachment #161904 for bug #203695

Lines 3-9 Link Here

(-)net/mpd5/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= mpd	4	PORTNAME= mpd
5	DISTVERSION= 5.7	5	DISTVERSION= 5.7
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= net	7	CATEGORIES= net
8	MASTER_SITES= SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION}	8	MASTER_SITES= SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION}
9	PKGNAMESUFFIX= 5	9	PKGNAMESUFFIX= 5

Line 0 Link Here

(-)net/mpd5/files/patch-src_bund.c (+11 lines)
	1	--- src/bund.c 2013-06-11 10:00:00.000000000 +0100
	2	+++ src/bund.c 2015-09-22 20:49:38.000000000 +0100
	3	@@ -891,7 +891,7 @@
	4
	5	} else if (!b->peer_mrru) { /* If no multilink, use peer MRU */
	6	mtu = MIN(b->links[the_link]->lcp.peer_mru,
	7	- b->links[the_link]->type->mtu);
	8	+ PhysGetMtu(b->links[the_link], 0));
	9
	10	} else { /* Multilink, use peer MRRU */
	11	mtu = MIN(b->peer_mrru, MP_MAX_MRRU);




--- src/lcp.c	2013-06-11 10:00:00.000000000 +0100
+++ src/lcp.c	2015-09-22 20:49:38.000000000 +0100
@@ -226,10 +226,10 @@
     lcp->peer_reject = 0;
 
     /* Initialize normal LCP stuff */
-    lcp->peer_mru = l->conf.mtu;
-    lcp->want_mru = l->conf.mru;
-    if (l->type && (lcp->want_mru > l->type->mru))
-	lcp->want_mru = l->type->mru;
+    lcp->peer_mru = PhysGetMtu(l, 1);
+    lcp->want_mru = PhysGetMru(l, 1);
+    if (l->type && (lcp->want_mru > PhysGetMru(l, 0)))
+	lcp->want_mru = PhysGetMru(l, 0);
     lcp->peer_accmap = 0xffffffff;
     lcp->want_accmap = l->conf.accmap;
     lcp->peer_acfcomp = FALSE;
@@ -793,7 +793,7 @@
 
     /* If we have got request, forget the previous values */
     if (mode == MODE_REQ) {
-	lcp->peer_mru = l->conf.mtu;
+	lcp->peer_mru = PhysGetMtu(l, 1);
 	lcp->peer_accmap = 0xffffffff;
 	lcp->peer_acfcomp = FALSE;
 	lcp->peer_protocomp = FALSE;

Line 0 Link Here

(-)net/mpd5/files/patch-src_phys.c (+55 lines)
	1	--- src/phys.c 2013-06-11 10:00:00.000000000 +0100
	2	+++ src/phys.c 2015-09-22 20:49:38.000000000 +0100
	3	@@ -466,6 +466,52 @@
	4	}
	5
	6	/*
	7	+ * PhysGetMtu()
	8	+ */
	9	+
	10	+u_short
	11	+PhysGetMtu(Link l, int conf)
	12	+{
	13	+ PhysType const pt = l->type;
	14	+
	15	+ if (pt) {
	16	+ if (pt->getmtu)
	17	+ return ((*pt->getmtu)(l, conf));
	18	+ if (conf == 0) {
	19	+ if (pt->mtu)
	20	+ return (pt->mtu);
	21	+ else
	22	+ return (0);
	23	+ } else
	24	+ return (l->conf.mtu);
	25	+ } else
	26	+ return (0);
	27	+}
	28	+
	29	+/*
	30	+ * PhysGetMru()
	31	+ */
	32	+
	33	+u_short
	34	+PhysGetMru(Link l, int conf)
	35	+{
	36	+ PhysType const pt = l->type;
	37	+
	38	+ if (pt) {
	39	+ if (pt->getmru)
	40	+ return ((*pt->getmru)(l, conf));
	41	+ if (conf == 0) {
	42	+ if (pt->mru)
	43	+ return (pt->mru);
	44	+ else
	45	+ return (0);
	46	+ } else
	47	+ return (l->conf.mru);
	48	+ } else
	49	+ return (0);
	50	+}
	51	+
	52	+/*
	53	* PhysIsBusy()
	54	*
	55	* This returns 1 if link is busy




--- src/phys.h	2013-06-11 10:00:00.000000000 +0100
+++ src/phys.h	2015-09-22 20:49:38.000000000 +0100
@@ -64,6 +64,8 @@
 						/* returns the calling number (IP, MAC, whatever) */
     int		(*callednum)(Link l, void *buf, size_t buf_len); 
 						/* returns the called number (IP, MAC, whatever) */
+    u_short	(*getmtu)(Link l, int conf);	/* returns actual MTU */
+    u_short	(*getmru)(Link l, int conf);	/* returns actual MRU */
   };
   typedef struct phystype	*PhysType;
 
@@ -99,6 +101,8 @@
   extern int		PhysGetPeerIface(Link l, char *buf, size_t buf_len);
   extern int		PhysGetCallingNum(Link l, char *buf, size_t buf_len);
   extern int		PhysGetCalledNum(Link l, char *buf, size_t buf_len);
+  extern u_short	PhysGetMtu(Link l, int conf);
+  extern u_short	PhysGetMru(Link l, int conf);
   extern int		PhysIsBusy(Link l);
  
   extern int		PhysInit(Link l);




--- src/pppoe.c	2013-06-11 10:00:00.000000000 +0100
+++ src/pppoe.c	2015-09-22 20:49:57.000000000 +0100
@@ -50,12 +50,14 @@
 	char		hook[NG_HOOKSIZ];	/* hook on that node */
 	char		session[MAX_SESSION];	/* session name */
 	char		acname[PPPOE_SERVICE_NAME_SIZE];	/* AC name */
+	uint16_t	max_payload;		/* PPP-Max-Payload (RFC4638) */
 	u_char		peeraddr[6];		/* Peer MAC address */
 	char		real_session[MAX_SESSION]; /* real session name */
 	char		agent_cid[64];		/* Agent Circuit ID */
 	char		agent_rid[64];		/* Agent Remote ID */
 	u_char		incoming;		/* incoming vs. outgoing */
 	u_char		opened;			/* PPPoE opened by phys */
+	u_char		mp_reply;		/* PPP-Max-Payload reply from server */
 	struct optinfo	options;
 	struct PppoeIf  *PIf;			/* pointer on parent ng_pppoe info */
 	struct PppoeList *list;
@@ -69,7 +71,8 @@
 enum {
 	SET_IFACE,
 	SET_SESSION,
-	SET_ACNAME
+	SET_ACNAME,
+	SET_MAX_PAYLOAD
 };
 
 /*
@@ -113,6 +116,8 @@
 static int	PppoeCalledNum(Link l, void *buf, size_t buf_len);
 static int	PppoeSelfName(Link l, void *buf, size_t buf_len);
 static int	PppoePeerName(Link l, void *buf, size_t buf_len);
+static u_short	PppoeGetMtu(Link l, int conf);
+static u_short	PppoeGetMru(Link l, int conf);
 static void	PppoeCtrlReadEvent(int type, void *arg);
 static void	PppoeConnectTimeout(void *arg);
 static void	PppoeStat(Context ctx);
@@ -155,6 +160,8 @@
     .callednum		= PppoeCalledNum,
     .selfname		= PppoeSelfName,
     .peername		= PppoePeerName,
+    .getmtu		= PppoeGetMtu,
+    .getmru		= PppoeGetMru
 };
 
 const struct cmdtab PppoeSetCmds[] = {
@@ -164,6 +171,10 @@
 	  PppoeSetCommand, NULL, 2, (void *)SET_SESSION },
       { "acname {name}",	"Set PPPoE access concentrator name",
 	  PppoeSetCommand, NULL, 2, (void *)SET_ACNAME },
+#ifdef NGM_PPPOE_SETMAXP_COOKIE
+      { "max-payload {size}",	"Set PPP-Max-Payload tag",
+	  PppoeSetCommand, NULL, 2, (void *)SET_MAX_PAYLOAD },
+#endif
       { NULL },
 };
 
@@ -213,6 +224,8 @@
 	pe->agent_cid[0] = 0;
 	pe->agent_rid[0] = 0;
 	pe->PIf = NULL;
+	pe->max_payload = 0;
+	pe->mp_reply = 0;
 
 	/* Done */
 	return(0);
@@ -327,6 +340,20 @@
     		    l->name, path, cn.ourhook, cn.path, cn.peerhook);
 		goto fail2;
 	}
+	
+#ifdef NGM_PPPOE_SETMAXP_COOKIE
+	const uint16_t max_payload = pe->max_payload;
+	if (pe->max_payload > 0) {
+	    Log(LG_PHYS, ("[%s] PPPoE: Set PPP-Max-Payload to '%d'",
+		l->name, max_payload));
+	}
+	/* Tell the PPPoE node to set PPP-Max-Payload value (unset if 0). */
+	if (NgSendMsg(pe->PIf->csock, path, NGM_PPPOE_COOKIE, NGM_PPPOE_SETMAXP,
+	    &max_payload, sizeof(uint16_t)) < 0) {
+		Perror("[%s] PPPoE can't set PPP-Max-Payload value", l->name);
+		goto fail2;
+	}
+#endif
 
 	Log(LG_PHYS, ("[%s] PPPoE: Connecting to '%s'", l->name, pe->session));
 	
@@ -351,6 +378,7 @@
 	strlcpy(pe->real_session, pe->session, sizeof(pe->real_session));
 	pe->agent_cid[0] = 0;
 	pe->agent_rid[0] = 0;
+	pe->mp_reply = 0;
 	return;
 
 fail3:
@@ -433,6 +461,7 @@
 	pi->real_session[0] = 0;
 	pi->agent_cid[0] = 0;
 	pi->agent_rid[0] = 0;
+	pi->mp_reply = 0;
 }
 
 /*
@@ -444,7 +473,11 @@
 PppoeCtrlReadEvent(int type, void *arg)
 {
 	union {
+#ifdef NGM_PPPOE_SETMAXP_COOKIE
+	    u_char buf[sizeof(struct ng_mesg) + sizeof(struct ngpppoe_maxp)];
+#else
 	    u_char buf[sizeof(struct ng_mesg) + sizeof(struct ngpppoe_sts)];
+#endif
 	    struct ng_mesg resp;
 	} u;
 	char path[NG_PATHSIZ];
@@ -468,6 +501,9 @@
 	    case NGM_PPPOE_SUCCESS:
 	    case NGM_PPPOE_FAIL:
 	    case NGM_PPPOE_CLOSE:
+#ifdef NGM_PPPOE_SETMAXP_COOKIE
+	    case NGM_PPPOE_SETMAXP:
+#endif
 	    {
 		char	ppphook[NG_HOOKSIZ];
 		char	*linkname, *rest;
@@ -535,6 +571,28 @@
 		Log(LG_PHYS, ("PPPoE: rec'd ACNAME \"%s\"",
 		  ((struct ngpppoe_sts *)u.resp.data)->hook));
 		break;
+#ifdef NGM_PPPOE_SETMAXP_COOKIE
+	    case NGM_PPPOE_SETMAXP:
+	    {
+		struct ngpppoe_maxp *maxp;
+		
+		maxp = ((struct ngpppoe_maxp *)u.resp.data);
+		Log(LG_PHYS, ("[%s] PPPoE: rec'd PPP-Max-Payload '%u'",
+		  l->name, maxp->data));
+		if (pi->max_payload > 0) {
+		    if (pi->max_payload == maxp->data)
+			pi->mp_reply = 1;
+		    else
+			Log(LG_PHYS,
+			  ("[%s] PPPoE: sent and returned values are not equal",
+			  l->name));
+		} else
+		    Log(LG_PHYS, ("[%s] PPPoE: server sent tag PPP-Max-Payload"
+		      " without request from the client",
+		      l->name));
+		break;
+	    }
+#endif
 	    default:
 		Log(LG_PHYS, ("PPPoE: rec'd command %lu from \"%s\"",
 		    (u_long)u.resp.header.cmd, path));
@@ -555,6 +613,9 @@
 	Printf("\tIface Node   : %s\r\n", pe->path);
 	Printf("\tIface Hook   : %s\r\n", pe->hook);
 	Printf("\tSession      : %s\r\n", pe->session);
+#ifdef NGM_PPPOE_SETMAXP_COOKIE
+	Printf("\tMax-Payload  : %u\r\n", pe->max_payload);
+#endif
 	Printf("PPPoE status:\r\n");
 	if (ctx->lnk->state != PHYS_STATE_DOWN) {
 	    Printf("\tOpened       : %s\r\n", (pe->opened?"YES":"NO"));
@@ -562,6 +623,7 @@
 	    PppoePeerMacAddr(ctx->lnk, buf, sizeof(buf));
 	    Printf("\tCurrent peer : %s\r\n", buf);
 	    Printf("\tSession      : %s\r\n", pe->real_session);
+	    Printf("\tMax-Payload  : %s\r\n", (pe->mp_reply?"YES":"NO"));
 	    Printf("\tCircuit-ID   : %s\r\n", pe->agent_cid);
 	    Printf("\tRemote-ID    : %s\r\n", pe->agent_rid);
 	}
@@ -657,6 +719,34 @@
 	return (0);
 }
 
+static u_short
+PppoeGetMtu(Link l, int conf)
+{
+	PppoeInfo	const pppoe = (PppoeInfo)l->info;
+
+	if (pppoe->max_payload > 0 && pppoe->mp_reply > 0)
+	    return (pppoe->max_payload);
+	else
+	    if (conf == 0)
+		return (l->type->mtu);
+	    else
+		return (l->conf.mtu);
+}
+
+static u_short
+PppoeGetMru(Link l, int conf)
+{
+	PppoeInfo	const pppoe = (PppoeInfo)l->info;
+
+	if (pppoe->max_payload > 0 && pppoe->mp_reply > 0)
+	    return (pppoe->max_payload);
+	else
+	    if (conf == 0)
+		return (l->type->mru);
+	    else
+		return (l->conf.mru);
+}
+
 static int 
 CreatePppoeNode(struct PppoeIf *PIf, const char *path, const char *hook)
 {
@@ -1340,7 +1430,9 @@
 	const PppoeInfo pi = (PppoeInfo) ctx->lnk->info;
 	const char *hookname = ETHER_DEFAULT_HOOK;
 	const char *colon;
-
+#ifdef NGM_PPPOE_SETMAXP_COOKIE
+	int ap;
+#endif
 	switch ((intptr_t)arg) {
 	case SET_IFACE:
 		switch (ac) {
@@ -1377,6 +1469,16 @@
 			return(-1);
 		strlcpy(pi->acname, av[0], sizeof(pi->acname));
 		break;
+#ifdef NGM_PPPOE_SETMAXP_COOKIE
+	case SET_MAX_PAYLOAD:
+		if (ac != 1)
+			return(-1);
+		ap = atoi(av[0]);
+		if (ap < PPPOE_MRU || ap > ETHER_MAX_LEN - 8)
+			Error("PPP-Max-Payload value \"%s\"", av[0]);
+		pi->max_payload = ap;
+		break;
+#endif
 	default:
 		assert(0);
 	}

Return to bug 203695

Line 0 Link Here

(-)net/mpd5/files/patch-src_lcp.c (+26 lines)
	1	--- src/lcp.c 2013-06-11 10:00:00.000000000 +0100
	2	+++ src/lcp.c 2015-09-22 20:49:38.000000000 +0100
	3	@@ -226,10 +226,10 @@
	4	lcp->peer_reject = 0;
	5
	6	/* Initialize normal LCP stuff */
	7	- lcp->peer_mru = l->conf.mtu;
	8	- lcp->want_mru = l->conf.mru;
	9	- if (l->type && (lcp->want_mru > l->type->mru))
	10	- lcp->want_mru = l->type->mru;
	11	+ lcp->peer_mru = PhysGetMtu(l, 1);
	12	+ lcp->want_mru = PhysGetMru(l, 1);
	13	+ if (l->type && (lcp->want_mru > PhysGetMru(l, 0)))
	14	+ lcp->want_mru = PhysGetMru(l, 0);
	15	lcp->peer_accmap = 0xffffffff;
	16	lcp->want_accmap = l->conf.accmap;
	17	lcp->peer_acfcomp = FALSE;
	18	@@ -793,7 +793,7 @@
	19
	20	/* If we have got request, forget the previous values */
	21	if (mode == MODE_REQ) {
	22	- lcp->peer_mru = l->conf.mtu;
	23	+ lcp->peer_mru = PhysGetMtu(l, 1);
	24	lcp->peer_accmap = 0xffffffff;
	25	lcp->peer_acfcomp = FALSE;
	26	lcp->peer_protocomp = FALSE;

Line 0 Link Here

(-)net/mpd5/files/patch-src_phys.h (+20 lines)
	1	--- src/phys.h 2013-06-11 10:00:00.000000000 +0100
	2	+++ src/phys.h 2015-09-22 20:49:38.000000000 +0100
	3	@@ -64,6 +64,8 @@
	4	/* returns the calling number (IP, MAC, whatever) */
	5	int (callednum)(Link l, void buf, size_t buf_len);
	6	/* returns the called number (IP, MAC, whatever) */
	7	+ u_short (getmtu)(Link l, int conf); / returns actual MTU */
	8	+ u_short (getmru)(Link l, int conf); / returns actual MRU */
	9	};
	10	typedef struct phystype *PhysType;
	11
	12	@@ -99,6 +101,8 @@
	13	extern int PhysGetPeerIface(Link l, char *buf, size_t buf_len);
	14	extern int PhysGetCallingNum(Link l, char *buf, size_t buf_len);
	15	extern int PhysGetCalledNum(Link l, char *buf, size_t buf_len);
	16	+ extern u_short PhysGetMtu(Link l, int conf);
	17	+ extern u_short PhysGetMru(Link l, int conf);
	18	extern int PhysIsBusy(Link l);
	19
	20	extern int PhysInit(Link l);

Line 0 Link Here

(-)net/mpd5/files/patch-src_pppoe.c (+234 lines)
		1	--- src/pppoe.c 2013-06-11 10:00:00.000000000 +0100
		2	+++ src/pppoe.c 2015-09-22 20:49:57.000000000 +0100
		3	@@ -50,12 +50,14 @@
		4	char hook[NG_HOOKSIZ]; /* hook on that node */
		5	char session[MAX_SESSION]; /* session name */
		6	char acname[PPPOE_SERVICE_NAME_SIZE]; /* AC name */
		7	+ uint16_t max_payload; /* PPP-Max-Payload (RFC4638) */
		8	u_char peeraddr[6]; /* Peer MAC address */
		9	char real_session[MAX_SESSION]; /* real session name */
		10	char agent_cid[64]; /* Agent Circuit ID */
		11	char agent_rid[64]; /* Agent Remote ID */
		12	u_char incoming; /* incoming vs. outgoing */
		13	u_char opened; /* PPPoE opened by phys */
		14	+ u_char mp_reply; /* PPP-Max-Payload reply from server */
		15	struct optinfo options;
		16	struct PppoeIf PIf; / pointer on parent ng_pppoe info */
		17	struct PppoeList *list;
		18	@@ -69,7 +71,8 @@
		19	enum {
		20	SET_IFACE,
		21	SET_SESSION,
		22	- SET_ACNAME
		23	+ SET_ACNAME,
		24	+ SET_MAX_PAYLOAD
		25	};
		26
		27	/*
		28	@@ -113,6 +116,8 @@
		29	static int PppoeCalledNum(Link l, void *buf, size_t buf_len);
		30	static int PppoeSelfName(Link l, void *buf, size_t buf_len);
		31	static int PppoePeerName(Link l, void *buf, size_t buf_len);
		32	+static u_short PppoeGetMtu(Link l, int conf);
		33	+static u_short PppoeGetMru(Link l, int conf);
		34	static void PppoeCtrlReadEvent(int type, void *arg);
		35	static void PppoeConnectTimeout(void *arg);
		36	static void PppoeStat(Context ctx);
		37	@@ -155,6 +160,8 @@
		38	.callednum = PppoeCalledNum,
		39	.selfname = PppoeSelfName,
		40	.peername = PppoePeerName,
		41	+ .getmtu = PppoeGetMtu,
		42	+ .getmru = PppoeGetMru
		43	};
		44
		45	const struct cmdtab PppoeSetCmds[] = {
		46	@@ -164,6 +171,10 @@
		47	PppoeSetCommand, NULL, 2, (void *)SET_SESSION },
		48	{ "acname {name}", "Set PPPoE access concentrator name",
		49	PppoeSetCommand, NULL, 2, (void *)SET_ACNAME },
		50	+#ifdef NGM_PPPOE_SETMAXP_COOKIE
		51	+ { "max-payload {size}", "Set PPP-Max-Payload tag",
		52	+ PppoeSetCommand, NULL, 2, (void *)SET_MAX_PAYLOAD },
		53	+#endif
		54	{ NULL },
		55	};
		56
		57	@@ -213,6 +224,8 @@
		58	pe->agent_cid[0] = 0;
		59	pe->agent_rid[0] = 0;
		60	pe->PIf = NULL;
		61	+ pe->max_payload = 0;
		62	+ pe->mp_reply = 0;
		63
		64	/* Done */
65	return(0);
66	@@ -327,6 +340,20 @@
67	l->name, path, cn.ourhook, cn.path, cn.peerhook);
68	goto fail2;
69	}
70	+
71	+#ifdef NGM_PPPOE_SETMAXP_COOKIE
72	+ const uint16_t max_payload = pe->max_payload;
73	+ if (pe->max_payload > 0) {
74	+ Log(LG_PHYS, ("[%s] PPPoE: Set PPP-Max-Payload to '%d'",
75	+ l->name, max_payload));
76	+ }
77	+ /* Tell the PPPoE node to set PPP-Max-Payload value (unset if 0). */
78	+ if (NgSendMsg(pe->PIf->csock, path, NGM_PPPOE_COOKIE, NGM_PPPOE_SETMAXP,
79	+ &max_payload, sizeof(uint16_t)) < 0) {
80	+ Perror("[%s] PPPoE can't set PPP-Max-Payload value", l->name);
81	+ goto fail2;
82	+ }
83	+#endif
84
85	Log(LG_PHYS, ("[%s] PPPoE: Connecting to '%s'", l->name, pe->session));
86
87	@@ -351,6 +378,7 @@
88	strlcpy(pe->real_session, pe->session, sizeof(pe->real_session));
89	pe->agent_cid[0] = 0;
90	pe->agent_rid[0] = 0;
91	+ pe->mp_reply = 0;
92	return;
93
94	fail3:
95	@@ -433,6 +461,7 @@
96	pi->real_session[0] = 0;
97	pi->agent_cid[0] = 0;
98	pi->agent_rid[0] = 0;
99	+ pi->mp_reply = 0;
100	}
101
102	/*
103	@@ -444,7 +473,11 @@
104	PppoeCtrlReadEvent(int type, void *arg)
105	{
106	union {
107	+#ifdef NGM_PPPOE_SETMAXP_COOKIE
108	+ u_char buf[sizeof(struct ng_mesg) + sizeof(struct ngpppoe_maxp)];
109	+#else
110	u_char buf[sizeof(struct ng_mesg) + sizeof(struct ngpppoe_sts)];
111	+#endif
112	struct ng_mesg resp;
113	} u;
114	char path[NG_PATHSIZ];
115	@@ -468,6 +501,9 @@
116	case NGM_PPPOE_SUCCESS:
117	case NGM_PPPOE_FAIL:
118	case NGM_PPPOE_CLOSE:
119	+#ifdef NGM_PPPOE_SETMAXP_COOKIE
120	+ case NGM_PPPOE_SETMAXP:
121	+#endif
122	{
123	char ppphook[NG_HOOKSIZ];
124	char linkname, rest;
125	@@ -535,6 +571,28 @@
126	Log(LG_PHYS, ("PPPoE: rec'd ACNAME \"%s\"",
127	((struct ngpppoe_sts *)u.resp.data)->hook));
128	break;
129	+#ifdef NGM_PPPOE_SETMAXP_COOKIE
130	+ case NGM_PPPOE_SETMAXP:
131	+ {
132	+ struct ngpppoe_maxp *maxp;
133	+
134	+ maxp = ((struct ngpppoe_maxp *)u.resp.data);
135	+ Log(LG_PHYS, ("[%s] PPPoE: rec'd PPP-Max-Payload '%u'",
136	+ l->name, maxp->data));
137	+ if (pi->max_payload > 0) {
138	+ if (pi->max_payload == maxp->data)
139	+ pi->mp_reply = 1;
140	+ else
141	+ Log(LG_PHYS,
142	+ ("[%s] PPPoE: sent and returned values are not equal",
143	+ l->name));
144	+ } else
145	+ Log(LG_PHYS, ("[%s] PPPoE: server sent tag PPP-Max-Payload"
146	+ " without request from the client",
147	+ l->name));
148	+ break;
149	+ }
150	+#endif
151	default:
152	Log(LG_PHYS, ("PPPoE: rec'd command %lu from \"%s\"",
153	(u_long)u.resp.header.cmd, path));
154	@@ -555,6 +613,9 @@
155	Printf("\tIface Node : %s\r\n", pe->path);
156	Printf("\tIface Hook : %s\r\n", pe->hook);
157	Printf("\tSession : %s\r\n", pe->session);
158	+#ifdef NGM_PPPOE_SETMAXP_COOKIE
159	+ Printf("\tMax-Payload : %u\r\n", pe->max_payload);
160	+#endif
161	Printf("PPPoE status:\r\n");
162	if (ctx->lnk->state != PHYS_STATE_DOWN) {
163	Printf("\tOpened : %s\r\n", (pe->opened?"YES":"NO"));
164	@@ -562,6 +623,7 @@
165	PppoePeerMacAddr(ctx->lnk, buf, sizeof(buf));
166	Printf("\tCurrent peer : %s\r\n", buf);
167	Printf("\tSession : %s\r\n", pe->real_session);
168	+ Printf("\tMax-Payload : %s\r\n", (pe->mp_reply?"YES":"NO"));
169	Printf("\tCircuit-ID : %s\r\n", pe->agent_cid);
170	Printf("\tRemote-ID : %s\r\n", pe->agent_rid);
171	}
172	@@ -657,6 +719,34 @@
173	return (0);
174	}
175
176	+static u_short
177	+PppoeGetMtu(Link l, int conf)
178	+{
179	+ PppoeInfo const pppoe = (PppoeInfo)l->info;
180	+
181	+ if (pppoe->max_payload > 0 && pppoe->mp_reply > 0)
182	+ return (pppoe->max_payload);
183	+ else
184	+ if (conf == 0)
185	+ return (l->type->mtu);
186	+ else
187	+ return (l->conf.mtu);
188	+}
189	+
190	+static u_short
191	+PppoeGetMru(Link l, int conf)
192	+{
193	+ PppoeInfo const pppoe = (PppoeInfo)l->info;
194	+
195	+ if (pppoe->max_payload > 0 && pppoe->mp_reply > 0)
196	+ return (pppoe->max_payload);
197	+ else
198	+ if (conf == 0)
199	+ return (l->type->mru);
200	+ else
201	+ return (l->conf.mru);
202	+}
203	+
204	static int
205	CreatePppoeNode(struct PppoeIf PIf, const char path, const char *hook)
206	{
207	@@ -1340,7 +1430,9 @@
208	const PppoeInfo pi = (PppoeInfo) ctx->lnk->info;
209	const char *hookname = ETHER_DEFAULT_HOOK;
210	const char *colon;
211	-
212	+#ifdef NGM_PPPOE_SETMAXP_COOKIE
213	+ int ap;
214	+#endif
215	switch ((intptr_t)arg) {
216	case SET_IFACE:
217	switch (ac) {
218	@@ -1377,6 +1469,16 @@
219	return(-1);
220	strlcpy(pi->acname, av[0], sizeof(pi->acname));
221	break;
222	+#ifdef NGM_PPPOE_SETMAXP_COOKIE
223	+ case SET_MAX_PAYLOAD:
224	+ if (ac != 1)
225	+ return(-1);
226	+ ap = atoi(av[0]);
227	+ if (ap < PPPOE_MRU \|\| ap > ETHER_MAX_LEN - 8)
228	+ Error("PPP-Max-Payload value \"%s\"", av[0]);
229	+ pi->max_payload = ap;
230	+ break;
231	+#endif
232	default:
233	assert(0);
234	}