X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fplugins%2Fpppoe%2Fpppoe.h;h=26e14f5d9f4fade2857887b4ee600e39abce00fa;hb=HEAD;hp=1517e34f61ba07870113beff724885e654ef4d60;hpb=bdd34ab1f2f87acb23c6d92feee7354ac53005ff;p=ppp.git diff --git a/pppd/plugins/pppoe/pppoe.h b/pppd/plugins/pppoe/pppoe.h index 1517e34..1952dcb 100644 --- a/pppd/plugins/pppoe/pppoe.h +++ b/pppd/plugins/pppoe/pppoe.h @@ -9,8 +9,6 @@ * This program may be distributed according to the terms of the GNU * General Public License, version 2 or (at your option) any later version. * -* $Id: pppoe.h,v 1.4 2008/06/15 04:35:50 paulus Exp $ -* ***********************************************************************/ #include /* For FILE */ @@ -242,6 +240,7 @@ typedef struct PPPoEConnectionStruct { int storedmru; /* Stored MRU */ int mtu; int mru; + char *actualACname; /* Name of AC we connected to */ } PPPoEConnection; /* Structure used to determine acceptable PADO or PADS packet */ @@ -272,7 +271,7 @@ void initPPP(void); void clampMSS(PPPoEPacket *packet, char const *dir, int clampMss); UINT16_t computeTCPChecksum(unsigned char *ipHdr, unsigned char *tcpHdr); UINT16_t pppFCS16(UINT16_t fcs, unsigned char *cp, int len); -void discovery1(PPPoEConnection *conn); +void discovery1(PPPoEConnection *conn, int waitWholeTimeoutForPADO); void discovery2(PPPoEConnection *conn); unsigned char *findTag(PPPoEPacket *packet, UINT16_t tagType, PPPoETag *tag); @@ -322,3 +321,10 @@ do {\ #define NOT_UNICAST(e) ((e[0] & 0x01) != 0) #define BROADCAST(e) ((e[0] & e[1] & e[2] & e[3] & e[4] & e[5]) == 0xFF) #define NOT_BROADCAST(e) ((e[0] & e[1] & e[2] & e[3] & e[4] & e[5]) != 0xFF) + +#ifndef MIN +#define MIN(a, b) ((a) < (b)? (a): (b)) +#endif +#ifndef MAX +#define MAX(a, b) ((a) > (b)? (a): (b)) +#endif