hrev51130 adds 3 changesets to branch 'master'
old head: bef731a331bd0d3f302e5ff6a61c672eb6b399bf
new head: fb19c096da1edb42ebfbf3d695e6e53e867acf7e
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=fb19c096da1e+%5Ebef731a331bd
----------------------------------------------------------------------------
859d401d4f63: libkernelppp: Report fatal problems deep in ppp to syslog
a1c76b3ef799: ppp/modem: Fix gcc5 build
fb19c096da1e: ppp/modem: Style cleanup
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
6 files changed, 59 insertions(+), 54 deletions(-)
.../kernel/network/ppp/modem/ACFCHandler.cpp | 20 ++---
src/add-ons/kernel/network/ppp/modem/Modem.h | 3 +-
.../kernel/network/ppp/modem/ModemDevice.cpp | 79 ++++++++++----------
.../kernel/network/ppp/modem/ModemDevice.h | 2 +-
src/add-ons/kernel/network/ppp/modem/modem.cpp | 5 +-
.../ppp/shared/libkernelppp/KPPPInterface.cpp | 4 +-
############################################################################
Commit: 859d401d4f6332ee936072ef6f0bf24e1aa957dc
URL: http://cgit.haiku-os.org/haiku/commit/?id=859d401d4f63
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Apr 26 21:30:25 2017 UTC
libkernelppp: Report fatal problems deep in ppp to syslog
----------------------------------------------------------------------------
diff --git
a/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPInterface.cpp
b/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPInterface.cpp
index 99a2516..4cb4ab4 100644
--- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPInterface.cpp
+++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPInterface.cpp
@@ -123,10 +123,10 @@ KPPPInterface::KPPPInterface(const char *name,
ppp_interface_entry *entry,
// load settings from description file
char path[B_PATH_NAME_LENGTH];
sprintf(path, "ptpnet/%s", name);
- // XXX: TODO: change base path to "/etc/ptpnet"
void *handle = load_driver_settings(path);
if (!handle) {
+ ERROR("KPPPInterface: Unable to load %s PPP driver
settings!\n", path);
fInitStatus = B_ERROR;
return;
}
@@ -138,6 +138,7 @@ KPPPInterface::KPPPInterface(const char *name,
ppp_interface_entry *entry,
// use the given settings
if (!fSettings) {
+ ERROR("KPPPInterface: No fSettings!\n");
fInitStatus = B_ERROR;
return;
}
@@ -145,6 +146,7 @@ KPPPInterface::KPPPInterface(const char *name,
ppp_interface_entry *entry,
// add internal modules
// LCP
if (!AddProtocol(&LCP())) {
+ ERROR("KPPPInterface: Could not add LCP protocol!\n");
fInitStatus = B_ERROR;
return;
}
############################################################################
Commit: a1c76b3ef79983103cf976ec3e8998d0bb4fbdcb
URL: http://cgit.haiku-os.org/haiku/commit/?id=a1c76b3ef799
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Apr 26 22:05:38 2017 UTC
ppp/modem: Fix gcc5 build
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/network/ppp/modem/ModemDevice.cpp
b/src/add-ons/kernel/network/ppp/modem/ModemDevice.cpp
index 01fd5fd..cb05ac6 100644
--- a/src/add-ons/kernel/network/ppp/modem/ModemDevice.cpp
+++ b/src/add-ons/kernel/network/ppp/modem/ModemDevice.cpp
@@ -482,8 +482,11 @@ ModemDevice::DataReceived(uint8 *buffer, uint32 length)
uint16 fcs = 0xffff;
fcs = pppfcs16(fcs, buffer, length - 2);
fcs ^= 0xffff;
- if(buffer[length - 2] != fcs & 0x00ff || buffer[length - 1] != (fcs &
0xff00) >> 8)
+ if (buffer[length - 2] != (fcs & 0x00ff)
+ || buffer[length - 1] != (fcs & 0xff00) >> 8) {
+ ERROR("ModemDevice: Incorrect FCS!\n");
return B_ERROR;
+ }
if(buffer[0] == ALL_STATIONS && buffer[1] == UI)
buffer += 2;
############################################################################
Revision: hrev51130
Commit: fb19c096da1edb42ebfbf3d695e6e53e867acf7e
URL: http://cgit.haiku-os.org/haiku/commit/?id=fb19c096da1e
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Apr 26 22:09:54 2017 UTC
ppp/modem: Style cleanup
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/network/ppp/modem/ACFCHandler.cpp
b/src/add-ons/kernel/network/ppp/modem/ACFCHandler.cpp
index 28853e7..21cc63c 100644
--- a/src/add-ons/kernel/network/ppp/modem/ACFCHandler.cpp
+++ b/src/add-ons/kernel/network/ppp/modem/ACFCHandler.cpp
@@ -24,7 +24,7 @@ status_t
ACFCHandler::AddToRequest(KPPPConfigurePacket& request)
{
// is ACFC not requested or was it rejected?
- if(fLocalState == ACFC_REJECTED
+ if (fLocalState == ACFC_REJECTED
|| (Options() & REQUEST_ACFC) == 0)
return B_OK;
@@ -40,7 +40,7 @@ status_t
ACFCHandler::ParseNak(const KPPPConfigurePacket& nak)
{
// naks do not contain ACFC items
- if(nak.ItemWithType(kACFCType))
+ if (nak.ItemWithType(kACFCType))
return B_ERROR;
return B_OK;
@@ -50,10 +50,10 @@ ACFCHandler::ParseNak(const KPPPConfigurePacket& nak)
status_t
ACFCHandler::ParseReject(const KPPPConfigurePacket& reject)
{
- if(reject.ItemWithType(kACFCType)) {
+ if (reject.ItemWithType(kACFCType)) {
fLocalState = ACFC_REJECTED;
- if(Options() & FORCE_ACFC_REQUEST)
+ if (Options() & FORCE_ACFC_REQUEST)
return B_ERROR;
}
@@ -64,12 +64,12 @@ ACFCHandler::ParseReject(const KPPPConfigurePacket& reject)
status_t
ACFCHandler::ParseAck(const KPPPConfigurePacket& ack)
{
- if(ack.ItemWithType(kACFCType))
+ if (ack.ItemWithType(kACFCType))
fLocalState = ACFC_ACCEPTED;
else {
fLocalState = ACFC_DISABLED;
- if(Options() & FORCE_ACFC_REQUEST)
+ if (Options() & FORCE_ACFC_REQUEST)
return B_ERROR;
}
@@ -81,10 +81,10 @@ status_t
ACFCHandler::ParseRequest(const KPPPConfigurePacket& request,
int32 index, KPPPConfigurePacket& nak, KPPPConfigurePacket& reject)
{
- if(!request.ItemWithType(kACFCType))
+ if (!request.ItemWithType(kACFCType))
return B_OK;
- if((Options() & ALLOW_ACFC) == 0) {
+ if ((Options() & ALLOW_ACFC) == 0) {
ppp_configure_item item;
item.type = kACFCType;
item.length = 2;
@@ -100,10 +100,10 @@ ACFCHandler::SendingAck(const KPPPConfigurePacket& ack)
{
ppp_configure_item *item = ack.ItemWithType(kACFCType);
- if(item && (Options() & ALLOW_ACFC) == 0)
+ if (item && (Options() & ALLOW_ACFC) == 0)
return B_ERROR;
- if(item)
+ if (item)
fPeerState = ACFC_ACCEPTED;
else
fPeerState = ACFC_DISABLED;
diff --git a/src/add-ons/kernel/network/ppp/modem/Modem.h
b/src/add-ons/kernel/network/ppp/modem/Modem.h
index 29e17fe..9507b43 100644
--- a/src/add-ons/kernel/network/ppp/modem/Modem.h
+++ b/src/add-ons/kernel/network/ppp/modem/Modem.h
@@ -2,7 +2,6 @@
* Copyright 2003-2004, Waldemar Kornewald <wkornew@xxxxxxx>
* Distributed under the terms of the MIT License.
*/
-
#ifndef MODEM__H
#define MODEM__H
@@ -12,8 +11,8 @@
#include <net_buffer.h>
#include <net_stack.h>
-class ModemDevice;
+class ModemDevice;
#define CONTROL_ESCAPE 0x7d
#define FLAG_SEQUENCE 0x7e
diff --git a/src/add-ons/kernel/network/ppp/modem/ModemDevice.cpp
b/src/add-ons/kernel/network/ppp/modem/ModemDevice.cpp
index cb05ac6..b3ccb54 100644
--- a/src/add-ons/kernel/network/ppp/modem/ModemDevice.cpp
+++ b/src/add-ons/kernel/network/ppp/modem/ModemDevice.cpp
@@ -22,7 +22,7 @@ static char sDigits[] = "0123456789ABCDEF";
void
dump_packet(net_buffer *packet)
{
- if(!packet)
+ if (!packet)
return;
uint8 *data = mtod(packet, uint8*);
@@ -32,10 +32,10 @@ dump_packet(net_buffer *packet)
TRACE("Dumping packet;len=%ld;pkthdr.len=%d\n", packet->m_len,
packet->m_flags & M_PKTHDR ? packet->m_pkthdr.len : -1);
- for(uint32 index = 0; index < packet->m_len; index++) {
+ for (uint32 index = 0; index < packet->m_len; index++) {
buffer[bufferIndex++] = sDigits[data[index] >> 4];
buffer[bufferIndex++] = sDigits[data[index] & 0x0F];
- if(bufferIndex == 32 || index == packet->m_len - 1) {
+ if (bufferIndex == 32 || index == packet->m_len - 1) {
buffer[bufferIndex] = 0;
TRACE("%s\n", buffer);
bufferIndex = 0;
@@ -49,7 +49,7 @@ status_t
modem_put_line(int32 handle, const char *string, int32 length)
{
char line[128];
- if(length > 126)
+ if (length > 126)
return -1;
sprintf(line, "%s\r", string);
@@ -60,19 +60,19 @@ modem_put_line(int32 handle, const char *string, int32
length)
status_t
modem_get_line(int32 handle, char *string, int32 length, const char *echo)
{
- if(!string || length < 40)
+ if (!string || length < 40)
return -1;
int32 result, position = 0;
while(position < length) {
result = read(handle, string + position, 1);
- if(result < 0)
+ if (result < 0)
return -1;
- else if(result == 1) {
- if(string[position] == '\r') {
+ else if (result == 1) {
+ if (string[position] == '\r') {
string[position] = 0;
- if(!strcasecmp(string, echo)) {
+ if (!strcasecmp(string, echo)) {
position = 0;
continue;
}
@@ -97,7 +97,7 @@ worker_thread(void *data)
uint8 buffer[MODEM_MTU];
// send init string
- if(modem_put_line(handle, device->InitString(),
strlen(device->InitString())) < 0
+ if (modem_put_line(handle, device->InitString(),
strlen(device->InitString())) < 0
|| modem_get_line(handle, (char*) buffer,
sizeof(buffer),
device->InitString()) < 0
|| strcmp((char*) buffer, "OK")) {
@@ -106,7 +106,7 @@ worker_thread(void *data)
}
// send dial string
- if(modem_put_line(handle, device->DialString(),
strlen(device->DialString())) < 0
+ if (modem_put_line(handle, device->DialString(),
strlen(device->DialString())) < 0
|| modem_get_line(handle, (char*) buffer,
sizeof(buffer),
device->DialString()) < 0
|| strncmp((char*) buffer, "CONNECT", 7)) {
@@ -114,7 +114,7 @@ worker_thread(void *data)
return B_ERROR;
}
- if(strlen((char*) buffer) > 8)
+ if (strlen((char*) buffer) > 8)
device->SetSpeed(atoi((char*) buffer + 8));
else
device->SetSpeed(19200);
@@ -129,20 +129,20 @@ worker_thread(void *data)
while(true) {
// ignore data if buffer is full
- if(position == MODEM_MTU)
+ if (position == MODEM_MTU)
position = 0;
length = read(handle, buffer + position, MODEM_MTU - position);
- if(length < 0 || !device->IsUp()) {
+ if (length < 0 || !device->IsUp()) {
device->ConnectionLost();
return B_ERROR;
}
// decode the packet
- for(int32 index = 0; index < length; ) {
- if(buffer[position] == FLAG_SEQUENCE) {
- if(inPacket && position > 0)
+ for (int32 index = 0; index < length; ) {
+ if (buffer[position] == FLAG_SEQUENCE) {
+ if (inPacket && position > 0)
device->DataReceived(buffer, position);
// DataReceived() will check FCS
@@ -156,16 +156,16 @@ worker_thread(void *data)
continue;
}
- if(buffer[position + index] < 0x20) {
+ if (buffer[position + index] < 0x20) {
++index;
continue;
}
- if(needsEscape) {
+ if (needsEscape) {
buffer[position] = buffer[position + index] ^
0x20;
++position;
needsEscape = false;
- } else if(buffer[position + index] == CONTROL_ESCAPE) {
+ } else if (buffer[position + index] == CONTROL_ESCAPE) {
++index;
needsEscape = true;
} else {
@@ -187,12 +187,12 @@ ModemDevice::ModemDevice(KPPPInterface& interface,
driver_parameter *settings)
{
#if DEBUG
TRACE("ModemDevice: Constructor\n");
- if(!settings || !settings->parameters)
+ if (!settings || !settings->parameters)
TRACE("ModemDevice::ctor: No settings!\n");
#endif
fACFC = new ACFCHandler(REQUEST_ACFC | ALLOW_ACFC, interface);
- if(!interface.LCP().AddOptionHandler(fACFC)) {
+ if (!interface.LCP().AddOptionHandler(fACFC)) {
fInitStatus = B_ERROR;
return;
}
@@ -220,7 +220,7 @@ ModemDevice::~ModemDevice()
status_t
ModemDevice::InitCheck() const
{
- if(fState != INITIAL && Handle() == -1)
+ if (fState != INITIAL && Handle() == -1)
return B_ERROR;
return PortName() && InitString() && DialString()
@@ -233,17 +233,17 @@ ModemDevice::Up()
{
TRACE("ModemDevice: Up()\n");
- if(InitCheck() != B_OK)
+ if (InitCheck() != B_OK)
return false;
- if(IsUp())
+ if (IsUp())
return true;
fState = INITIAL;
// reset state
// check if we are allowed to go up now (user intervention might
disallow that)
- if(!UpStarted()) {
+ if (!UpStarted()) {
CloseModem();
DownEvent();
return true;
@@ -254,7 +254,7 @@ ModemDevice::Up()
fState = DIALING;
- if(fWorkerThread == -1) {
+ if (fWorkerThread == -1) {
fWorkerThread = spawn_kernel_thread(worker_thread, "Modem:
worker_thread",
B_NORMAL_PRIORITY, this);
resume_thread(fWorkerThread);
@@ -269,12 +269,12 @@ ModemDevice::Down()
{
TRACE("ModemDevice: Down()\n");
- if(InitCheck() != B_OK)
+ if (InitCheck() != B_OK)
return false;
fState = TERMINATING;
- if(!IsUp()) {
+ if (!IsUp()) {
fState = INITIAL;
CloseModem();
DownEvent();
@@ -328,14 +328,14 @@ ModemDevice::CountOutputBytes() const
void
ModemDevice::OpenModem()
{
- if(Handle() >= 0)
+ if (Handle() >= 0)
return;
fHandle = open(PortName(), O_RDWR);
// init port
struct termios options;
- if(ioctl(fHandle, TCGETA, &options) != B_OK) {
+ if (ioctl(fHandle, TCGETA, &options) != B_OK) {
ERROR("ModemDevice: Could not retrieve port options!\n");
return;
}
@@ -350,7 +350,7 @@ ModemDevice::OpenModem()
options.c_cc[VTIME] = 10;
// set new options
- if(ioctl(fHandle, TCSETA, &options) != B_OK) {
+ if (ioctl(fHandle, TCSETA, &options) != B_OK) {
ERROR("ModemDevice: Could not init port!\n");
return;
}
@@ -360,7 +360,7 @@ ModemDevice::OpenModem()
void
ModemDevice::CloseModem()
{
- if(Handle() >= 0)
+ if (Handle() >= 0)
close(Handle());
fHandle = -1;
@@ -393,7 +393,7 @@ ModemDevice::ConnectionLost()
fWorkerThread = -1;
fOutputBytes = 0;
snooze(ESCAPE_DELAY);
- if(write(Handle(), ESCAPE_SEQUENCE, strlen(ESCAPE_SEQUENCE)) < 0)
+ if (write(Handle(), ESCAPE_SEQUENCE, strlen(ESCAPE_SEQUENCE)) < 0)
return;
snooze(ESCAPE_DELAY);
@@ -447,8 +447,8 @@ ModemDevice::Send(net_buffer *packet, uint16 protocolNumber)
// encode packet
buffer[position++] = FLAG_SEQUENCE;
// mark beginning of packet
- for(int32 index = 0; index < length; index++) {
- if(data[index] < 0x20 || data[index] == FLAG_SEQUENCE
+ for (int32 index = 0; index < length; index++) {
+ if (data[index] < 0x20 || data[index] == FLAG_SEQUENCE
|| data[index] == CONTROL_ESCAPE) {
buffer[position++] = CONTROL_ESCAPE;
buffer[position++] = data[index] ^ 0x20;
@@ -488,7 +488,7 @@ ModemDevice::DataReceived(uint8 *buffer, uint32 length)
return B_ERROR;
}
- if(buffer[0] == ALL_STATIONS && buffer[1] == UI)
+ if (buffer[0] == ALL_STATIONS && buffer[1] == UI)
buffer += 2;
net_buffer* packet = gBufferModule->create(length - 2);
diff --git a/src/add-ons/kernel/network/ppp/modem/ModemDevice.h
b/src/add-ons/kernel/network/ppp/modem/ModemDevice.h
index 111559f..9af04b7 100644
--- a/src/add-ons/kernel/network/ppp/modem/ModemDevice.h
+++ b/src/add-ons/kernel/network/ppp/modem/ModemDevice.h
@@ -2,10 +2,10 @@
* Copyright 2003-2006, Waldemar Kornewald <wkornew@xxxxxxx>
* Distributed under the terms of the MIT License.
*/
-
#ifndef MODEM_DEVICE__H
#define MODEM_DEVICE__H
+
#include "Modem.h"
#include <KPPPDevice.h>
diff --git a/src/add-ons/kernel/network/ppp/modem/modem.cpp
b/src/add-ons/kernel/network/ppp/modem/modem.cpp
index fc583f6..c4007b3 100644
--- a/src/add-ons/kernel/network/ppp/modem/modem.cpp
+++ b/src/add-ons/kernel/network/ppp/modem/modem.cpp
@@ -3,6 +3,7 @@
* Distributed under the terms of the MIT License.
*/
+
#include <KernelExport.h>
#include <driver_settings.h>
@@ -23,12 +24,12 @@ static bool
add_to(KPPPInterface& mainInterface, KPPPInterface *subInterface,
driver_parameter *settings, ppp_module_key_type type)
{
- if(mainInterface.Mode() != PPP_CLIENT_MODE || type !=
PPP_DEVICE_KEY_TYPE)
+ if (mainInterface.Mode() != PPP_CLIENT_MODE || type !=
PPP_DEVICE_KEY_TYPE)
return B_ERROR;
ModemDevice *device;
bool success;
- if(subInterface) {
+ if (subInterface) {
device = new ModemDevice(*subInterface, settings);
success = subInterface->SetDevice(device);
} else {
