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

Okay, by quick and dirty, one should read broken.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40247 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin
2011-01-18 20:08:48 +00:00
parent ec4c457ca3
commit 1071298672
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/devices/dialup/dialup.cpp
+17 -11
View File
@@ -53,7 +53,7 @@ struct dialup_device : net_device {
char escape_string[8]; char escape_string[8];
bigtime_t escape_silence; bigtime_t escape_silence;
char hangup_string[16]; char hangup_string[16];
bigtime_t flag_timeout; bigtime_t tx_flag_timeout;
uint32 rx_accm; uint32 rx_accm;
uint32 tx_accm[8]; uint32 tx_accm[8];
}; };
@@ -226,8 +226,8 @@ dialup_init(const char* name, net_device** _device)
device->tx_flag_timeout = 1000000; device->tx_flag_timeout = 1000000;
// default rx & tx Async-Control-Character-Map // default rx & tx Async-Control-Character-Map
memset(device->rx_accm, 0xFF, sizeof(device->rx_accm)); memset(&device->rx_accm, 0xFF, sizeof(device->rx_accm));
memset(device->tx_accm, 0xFF, sizeof(device->tx_accm)); memset(&device->tx_accm, 0xFF, sizeof(device->tx_accm));
*_device = device; *_device = device;
return B_OK; return B_OK;
@@ -401,8 +401,9 @@ dialup_send_data(net_device* _device, net_buffer* buffer)
// more than a second ago. // more than a second ago.
// Otherwise, the prior closing flag sequence is the open flag of this // Otherwise, the prior closing flag sequence is the open flag of this
// frame // frame
if (device->flag_timeout if (device->tx_flag_timeout
&& system_time() - device->last_closing_flag_sequence_time > device->flagt_timeout) { && system_time() - device->last_closing_flag_sequence_time
> device->tx_flag_timeout) {
packet[packetSize++] = HDLC_FLAG_SEQUENCE; packet[packetSize++] = HDLC_FLAG_SEQUENCE;
} }
@@ -463,15 +464,17 @@ dialup_receive_data(net_device* _device, net_buffer** _buffer)
if (buffer == NULL) if (buffer == NULL)
return ENOBUFS; return ENOBUFS;
status_t status;
ssize_t bytesRead; ssize_t bytesRead;
uint8* data; uint8* data = NULL;
packet = (uint8*)malloc(2 + 2 * buffer->size); uint8* packet = (uint8*)malloc(2 + 2 * buffer->size);
if (packet == NULL) { if (packet == NULL) {
status = B_NO_MEMORY; status = B_NO_MEMORY;
goto err; goto err;
} }
status_t status = gBufferModule->append_size(buffer, device->mtu + HDLC_HEADER_LENGTH, &data); status = gBufferModule->append_size(buffer,
device->mtu + HDLC_HEADER_LENGTH, (void**)&data);
if (status == B_OK && data == NULL) { if (status == B_OK && data == NULL) {
dprintf("scattered I/O is not yet supported by dialup device.\n"); dprintf("scattered I/O is not yet supported by dialup device.\n");
status = B_NOT_SUPPORTED; status = B_NOT_SUPPORTED;
@@ -480,9 +483,10 @@ dialup_receive_data(net_device* _device, net_buffer** _buffer)
goto err; goto err;
while (true) { while (true) {
bytesRead = read(device->fd, data, device->frame_size); bytesRead = read(device->fd, data, device->mtu + HDLC_HEADER_LENGTH);
if (bytesRead < 0) { if (bytesRead < 0) {
// TODO
}
} }
status = gBufferModule->trim(buffer, bytesRead); status = gBufferModule->trim(buffer, bytesRead);
@@ -495,10 +499,12 @@ dialup_receive_data(net_device* _device, net_buffer** _buffer)
device->stats.receive.packets++; device->stats.receive.packets++;
*_buffer = buffer; *_buffer = buffer;
return B_OK; status = B_OK;
goto done;
err: err:
gBufferModule->free(buffer); gBufferModule->free(buffer);
device->stats.receive.errors++;
done: done:
free(packet); free(packet);