From b8f24e83767263443414d6235da68b94c4319714 Mon Sep 17 00:00:00 2001 From: Waldemar Kornewald Date: Fri, 26 Mar 2004 11:27:50 +0000 Subject: [PATCH] Sorry, I did not commit this change (sharing the configuration values between the IPCP kernel and DialUpPreflet modules). git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7067 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/network/ppp/ipcp/IPCP.h | 20 +++++++++++++++++ .../kernel/network/ppp/ipcp/Protocol.cpp | 22 +++++++++++-------- 2 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 src/add-ons/kernel/network/ppp/ipcp/IPCP.h diff --git a/src/add-ons/kernel/network/ppp/ipcp/IPCP.h b/src/add-ons/kernel/network/ppp/ipcp/IPCP.h new file mode 100644 index 0000000000..71685db80d --- /dev/null +++ b/src/add-ons/kernel/network/ppp/ipcp/IPCP.h @@ -0,0 +1,20 @@ +//----------------------------------------------------------------------- +// This software is part of the OpenBeOS distribution and is covered +// by the OpenBeOS license. +// +// Copyright (c) 2003-2004 Waldemar Kornewald, Waldemar.Kornewald@web.de +//----------------------------------------------------------------------- + +#ifndef IPCP__H +#define IPCP__H + + +#define IPCP_LOCAL_SIDE_KEY "Local" +#define IPCP_PEER_SIDE_KEY "Peer" +#define IPCP_IP_ADDRESS_KEY "Address" +#define IPCP_NETMASK_KEY "Netmask" +#define IPCP_PRIMARY_DNS_KEY "PrimaryDNS" +#define IPCP_SECONDARY_DNS_KEY "SecondaryDNS" + + +#endif diff --git a/src/add-ons/kernel/network/ppp/ipcp/Protocol.cpp b/src/add-ons/kernel/network/ppp/ipcp/Protocol.cpp index cf8a8670c8..194ac048b0 100644 --- a/src/add-ons/kernel/network/ppp/ipcp/Protocol.cpp +++ b/src/add-ons/kernel/network/ppp/ipcp/Protocol.cpp @@ -6,6 +6,7 @@ //----------------------------------------------------------------------- #include "Protocol.h" +#include "IPCP.h" #include #include #include @@ -18,7 +19,7 @@ #include -#define PPP_STATE_MACHINE_TIMEOUT 3000000 +#define IPCP_STATE_MACHINE_TIMEOUT 3000000 // 3 seconds @@ -94,8 +95,10 @@ IPCP::ProfileChanged() // "Local" and "Peer" describe each side's settings const driver_parameter *profile = Interface().Profile().SettingsFor("protocol", "ipcp"); - ParseSideRequests(get_parameter_with_name("Local", profile), PPP_LOCAL_SIDE); - ParseSideRequests(get_parameter_with_name("Peer", profile), PPP_PEER_SIDE); + ParseSideRequests(get_parameter_with_name(IPCP_LOCAL_SIDE_KEY, profile), + PPP_LOCAL_SIDE); + ParseSideRequests(get_parameter_with_name(IPCP_PEER_SIDE_KEY, profile), + PPP_PEER_SIDE); } @@ -347,15 +350,16 @@ IPCP::ParseSideRequests(const driver_parameter *requests, ppp_side side) continue; } - if(!strcasecmp(requests->parameters[index].name, "Address")) + if(!strcasecmp(requests->parameters[index].name, IPCP_IP_ADDRESS_KEY)) selectedRequests->address = address; - else if(!strcasecmp(requests->parameters[index].name, "Netmask")) + else if(!strcasecmp(requests->parameters[index].name, IPCP_NETMASK_KEY)) selectedRequests->netmask = address; - else if(!strcasecmp(requests->parameters[index].name, "PrimaryDNS")) { + else if(!strcasecmp(requests->parameters[index].name, IPCP_PRIMARY_DNS_KEY)) { selectedRequests->primaryDNS = address; if(side == PPP_LOCAL_SIDE) fRequestPrimaryDNS = true; - } else if(!strcasecmp(requests->parameters[index].name, "SecondaryDNS")) { + } else if(!strcasecmp(requests->parameters[index].name, + IPCP_SECONDARY_DNS_KEY)) { selectedRequests->secondaryDNS = address; if(side == PPP_LOCAL_SIDE) fRequestSecondaryDNS = true; @@ -1190,7 +1194,7 @@ IPCP::SendConfigureRequest() LockerHelper locker(fLock); --fRequestCounter; - fNextTimeout = system_time() + PPP_STATE_MACHINE_TIMEOUT; + fNextTimeout = system_time() + IPCP_STATE_MACHINE_TIMEOUT; locker.UnlockNow(); KPPPConfigurePacket request(PPP_CONFIGURE_REQUEST); @@ -1339,7 +1343,7 @@ IPCP::SendTerminateRequest() LockerHelper locker(fLock); --fTerminateCounter; - fNextTimeout = system_time() + PPP_STATE_MACHINE_TIMEOUT; + fNextTimeout = system_time() + IPCP_STATE_MACHINE_TIMEOUT; locker.UnlockNow(); struct mbuf *packet = m_gethdr(MT_DATA);