3b7b927dd0
The BNetworkRoute class manages a route_entry and the sockaddr's associated with it. It replaces the direct use of route_entry in the BNetworkInterface API. Using route_entry is fragile and inconvenient as it only holds pointers to the sockaddr's. When getting a list of routes from the kernel, each route_entry is set up so that its pointers point into the single flat buffer that is passed around. Creating a copy of the route_entry and then deleting the flat buffer makes the pointers in the copy stale. Returning these route entries therefore always lead to a use-after-free when they were eventually used. BNetworkRoute also takes over the code and functionallity of getting routes from RouteSupport. The corresponding method in BNetworkRoster is replaced by a static method in BNetworkRoute. Also distinguish between the default route and gateway of an interface. GetDefaultRoute() now gets the default BNetworkRoute for the interface while GetDefaultGateway() gets the associated gateway address within that default route. Adjust network preferences panel to this change. Note that we currently only seem to have per interface default routes and not an actual global default route. This was already the case before these changes and I did not further investigate what this means.
54 lines
1.3 KiB
C++
54 lines
1.3 KiB
C++
/*
|
|
* Copyright 2010, Haiku, Inc. All Rights Reserved.
|
|
* Distributed under the terms of the MIT License.
|
|
*/
|
|
#ifndef _NETWORK_ROSTER_H
|
|
#define _NETWORK_ROSTER_H
|
|
|
|
|
|
#include <Locker.h>
|
|
#include <NetworkNotifications.h>
|
|
#include <ObjectList.h>
|
|
|
|
class BMessenger;
|
|
class BNetworkInterface;
|
|
struct wireless_network;
|
|
|
|
|
|
class BNetworkRoster {
|
|
public:
|
|
static BNetworkRoster& Default();
|
|
|
|
size_t CountInterfaces() const;
|
|
status_t GetNextInterface(uint32* cookie,
|
|
BNetworkInterface& interface) const;
|
|
|
|
status_t AddInterface(const char* name);
|
|
status_t AddInterface(
|
|
const BNetworkInterface& interface);
|
|
status_t RemoveInterface(const char* name);
|
|
status_t RemoveInterface(
|
|
const BNetworkInterface& interface);
|
|
|
|
int32 CountPersistentNetworks() const;
|
|
status_t GetNextPersistentNetwork(uint32* cookie,
|
|
wireless_network& network) const;
|
|
status_t AddPersistentNetwork(
|
|
const wireless_network& network);
|
|
status_t RemovePersistentNetwork(const char* name);
|
|
|
|
status_t StartWatching(const BMessenger& target,
|
|
uint32 eventMask);
|
|
void StopWatching(const BMessenger& target);
|
|
|
|
private:
|
|
BNetworkRoster();
|
|
~BNetworkRoster();
|
|
|
|
private:
|
|
static BNetworkRoster sDefault;
|
|
};
|
|
|
|
|
|
#endif // _NETWORK_ROSTER_H
|