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

use generic UserBuffer in fill_route_entry

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20502 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Hugo Santos
2007-04-01 17:36:41 +00:00
parent 298a7da920
commit 5333836f71
1 changed files with 15 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/stack/routes.cpp
+15 -52
View File
@@ -10,6 +10,7 @@
#include "domains.h"
#include "routes.h"
#include "stack_private.h"
#include "utility.h"
#include <net_device.h>
#include <NetUtilities.h>
@@ -35,53 +36,6 @@
#endif
class UserRouteBuffer {
public:
UserRouteBuffer(uint8 *buffer, size_t available)
:
fBuffer(buffer),
fAvailable(available),
fStatus(B_OK)
{
}
sockaddr *
Copy(sockaddr *source)
{
sockaddr *target = (sockaddr *)fBuffer;
if (fStatus != B_OK
|| source == NULL
|| (fStatus = _Copy(source)) != B_OK)
return NULL;
return target;
}
status_t Status() const { return fStatus; }
private:
status_t
_Copy(sockaddr *source)
{
if (fAvailable < source->sa_len)
return ENOBUFS;
if (user_memcpy(fBuffer, source, source->sa_len) < B_OK)
return B_BAD_ADDRESS;
fAvailable -= source->sa_len;
fBuffer += source->sa_len;
return B_OK;
}
uint8 *fBuffer;
size_t fAvailable;
status_t fStatus;
};
net_route_private::net_route_private()
{
destination = mask = gateway = NULL;
@@ -481,17 +435,26 @@ remove_route(struct net_domain *_domain, const struct net_route *removeRoute)
}
static sockaddr *
copy_address(UserBuffer &buffer, sockaddr *address)
{
if (address == NULL)
return NULL;
return (sockaddr *)buffer.Copy(address, address->sa_len);
}
static status_t
fill_route_entry(route_entry *target, void *_buffer, size_t bufferSize,
net_route *route)
{
UserRouteBuffer buffer(((uint8 *)_buffer) + sizeof(route_entry),
UserBuffer buffer(((uint8 *)_buffer) + sizeof(route_entry),
bufferSize - sizeof(route_entry));
target->destination = buffer.Copy(route->destination);
target->mask = buffer.Copy(route->mask);
target->gateway = buffer.Copy(route->gateway);
target->source = buffer.Copy(route->interface->address);
target->destination = copy_address(buffer, route->destination);
target->mask = copy_address(buffer, route->mask);
target->gateway = copy_address(buffer, route->gateway);
target->source = copy_address(buffer, route->interface->address);
target->flags = route->flags;
target->mtu = route->mtu;