i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sorry, I did not commit this change (sharing the configuration values between the IPCP kernel and DialUpPreflet modules).

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7067 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Waldemar Kornewald
2004-03-26 11:27:50 +00:00
parent 0f39928deb
commit b8f24e8376
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/ppp/ipcp/IPCP.h
+20
View File
@@ -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, [email protected]
//-----------------------------------------------------------------------
#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
src/add-ons/kernel/network/ppp/ipcp/Protocol.cpp
+13 -9
View File
@@ -6,6 +6,7 @@
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
#include "Protocol.h" #include "Protocol.h"
#include "IPCP.h"
#include <KPPPConfigurePacket.h> #include <KPPPConfigurePacket.h>
#include <KPPPInterface.h> #include <KPPPInterface.h>
#include <settings_tools.h> #include <settings_tools.h>
@@ -18,7 +19,7 @@
#include <sys/sockio.h> #include <sys/sockio.h>
#define PPP_STATE_MACHINE_TIMEOUT 3000000 #define IPCP_STATE_MACHINE_TIMEOUT 3000000
// 3 seconds // 3 seconds
@@ -94,8 +95,10 @@ IPCP::ProfileChanged()
// "Local" and "Peer" describe each side's settings // "Local" and "Peer" describe each side's settings
const driver_parameter *profile const driver_parameter *profile
= Interface().Profile().SettingsFor("protocol", "ipcp"); = Interface().Profile().SettingsFor("protocol", "ipcp");
ParseSideRequests(get_parameter_with_name("Local", profile), PPP_LOCAL_SIDE); ParseSideRequests(get_parameter_with_name(IPCP_LOCAL_SIDE_KEY, profile),
ParseSideRequests(get_parameter_with_name("Peer", profile), PPP_PEER_SIDE); 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; continue;
} }
if(!strcasecmp(requests->parameters[index].name, "Address")) if(!strcasecmp(requests->parameters[index].name, IPCP_IP_ADDRESS_KEY))
selectedRequests->address = address; selectedRequests->address = address;
else if(!strcasecmp(requests->parameters[index].name, "Netmask")) else if(!strcasecmp(requests->parameters[index].name, IPCP_NETMASK_KEY))
selectedRequests->netmask = address; 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; selectedRequests->primaryDNS = address;
if(side == PPP_LOCAL_SIDE) if(side == PPP_LOCAL_SIDE)
fRequestPrimaryDNS = true; fRequestPrimaryDNS = true;
} else if(!strcasecmp(requests->parameters[index].name, "SecondaryDNS")) { } else if(!strcasecmp(requests->parameters[index].name,
IPCP_SECONDARY_DNS_KEY)) {
selectedRequests->secondaryDNS = address; selectedRequests->secondaryDNS = address;
if(side == PPP_LOCAL_SIDE) if(side == PPP_LOCAL_SIDE)
fRequestSecondaryDNS = true; fRequestSecondaryDNS = true;
@@ -1190,7 +1194,7 @@ IPCP::SendConfigureRequest()
LockerHelper locker(fLock); LockerHelper locker(fLock);
--fRequestCounter; --fRequestCounter;
fNextTimeout = system_time() + PPP_STATE_MACHINE_TIMEOUT; fNextTimeout = system_time() + IPCP_STATE_MACHINE_TIMEOUT;
locker.UnlockNow(); locker.UnlockNow();
KPPPConfigurePacket request(PPP_CONFIGURE_REQUEST); KPPPConfigurePacket request(PPP_CONFIGURE_REQUEST);
@@ -1339,7 +1343,7 @@ IPCP::SendTerminateRequest()
LockerHelper locker(fLock); LockerHelper locker(fLock);
--fTerminateCounter; --fTerminateCounter;
fNextTimeout = system_time() + PPP_STATE_MACHINE_TIMEOUT; fNextTimeout = system_time() + IPCP_STATE_MACHINE_TIMEOUT;
locker.UnlockNow(); locker.UnlockNow();
struct mbuf *packet = m_gethdr(MT_DATA); struct mbuf *packet = m_gethdr(MT_DATA);