hrev51070 adds 1 changeset to branch 'master'
old head: c931e464e850c9cc797449d76ee8076f3d81a331
new head: ceff2b88ae26f78af0f954d8836ab50765ff7733
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=ceff2b88ae26+%5Ec931e464e850
----------------------------------------------------------------------------
ceff2b88ae26: ppp: Basic build fixes on x86_64
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51070
Commit: ceff2b88ae26f78af0f954d8836ab50765ff7733
URL: http://cgit.haiku-os.org/haiku/commit/?id=ceff2b88ae26
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Apr 5 19:32:24 2017 UTC
----------------------------------------------------------------------------
10 files changed, 19 insertions(+), 24 deletions(-)
src/add-ons/kernel/network/devices/dialup/dialup.cpp | 3 ++-
src/add-ons/kernel/network/ppp/ipcp/Jamfile | 3 ---
src/add-ons/kernel/network/ppp/ipcp/Protocol.cpp | 2 +-
src/add-ons/kernel/network/ppp/ppp/ppp.cpp | 4 ++--
src/add-ons/kernel/network/ppp/pppoe/DiscoveryPacket.cpp | 6 +++---
src/add-ons/kernel/network/ppp/pppoe/PPPoEDevice.cpp | 5 +++--
src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile | 5 -----
.../kernel/network/ppp/shared/libkernelppp/KPPPLCP.cpp | 4 ++--
src/add-ons/kernel/network/ppp/shared/libkernelppp/TODO | 1 -
.../kernel/network/ppp/shared/libppp/PPPManager.cpp | 10 ++++++----
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/network/devices/dialup/dialup.cpp
b/src/add-ons/kernel/network/devices/dialup/dialup.cpp
index 8073114..3a472d5 100644
--- a/src/add-ons/kernel/network/devices/dialup/dialup.cpp
+++ b/src/add-ons/kernel/network/devices/dialup/dialup.cpp
@@ -373,7 +373,8 @@ dialup_send_data(net_device* _device, net_buffer* buffer)
if (device->fd == -1)
return B_FILE_ERROR;
- dprintf("try to send HDLC packet of %lu bytes (flags %ld):\n",
buffer->size, buffer->flags);
+ dprintf("try to send HDLC packet of %" B_PRIu32 " bytes "
+ "(flags 0x%" B_PRIx32 "):\n", buffer->size, buffer->flags);
if (buffer->size < HDLC_HEADER_LENGTH)
return B_BAD_VALUE;
diff --git a/src/add-ons/kernel/network/ppp/ipcp/Jamfile
b/src/add-ons/kernel/network/ppp/ipcp/Jamfile
index 9a77ff1..8787bdf 100644
--- a/src/add-ons/kernel/network/ppp/ipcp/Jamfile
+++ b/src/add-ons/kernel/network/ppp/ipcp/Jamfile
@@ -24,7 +24,6 @@ UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network
ppp pppoe
] : true ;
KernelAddon ipcp :
- atomic.S
kernel_cpp.cpp
# imported from kernel util
@@ -40,8 +39,6 @@ SEARCH on [ FGristFiles inet_addr.c ]
SEARCH on [ FGristFiles kernel_cpp.cpp ]
= [ FDirName $(HAIKU_TOP) src system kernel util ] ;
-SEARCH on [ FGristFiles atomic.S ]
- = [ FDirName $(HAIKU_TOP) src system libroot os arch $(TARGET_ARCH) ] ;
LinkAgainst ipcp : libkernelppp.a ;
diff --git a/src/add-ons/kernel/network/ppp/ipcp/Protocol.cpp
b/src/add-ons/kernel/network/ppp/ipcp/Protocol.cpp
index f6595af..d09da9d 100644
--- a/src/add-ons/kernel/network/ppp/ipcp/Protocol.cpp
+++ b/src/add-ons/kernel/network/ppp/ipcp/Protocol.cpp
@@ -153,7 +153,7 @@ IPCP::StackControl(uint32 op, void *data)
break;
default:
- ERROR("IPCP: Unknown ioctl: %ld\n", op);
+ ERROR("IPCP: Unknown ioctl: %" B_PRIu32 "\n", op);
return KPPPProtocol::StackControl(op, data);
}
diff --git a/src/add-ons/kernel/network/ppp/ppp/ppp.cpp
b/src/add-ons/kernel/network/ppp/ppp/ppp.cpp
index a596f22..33eb164 100644
--- a/src/add-ons/kernel/network/ppp/ppp/ppp.cpp
+++ b/src/add-ons/kernel/network/ppp/ppp/ppp.cpp
@@ -71,9 +71,9 @@ ppp_init(const char *name, net_device **_device)
if (idInterface <= 0 || pppInterface == NULL) {
if (idInterface <= 0)
- dprintf("%s: idInterface:%ld\n", __func__, idInterface);
+ dprintf("%s: idInterface: %" B_PRIu32 "\n", __func__,
idInterface);
else
- dprintf("%s: pppInterface == NULL %ld\n", __func__,
idInterface);
+ dprintf("%s: pppInterface == NULL %" B_PRIu32 "\n",
__func__, idInterface);
put_module(NET_BUFFER_MODULE_NAME);
return B_NO_MEMORY;
}
diff --git a/src/add-ons/kernel/network/ppp/pppoe/DiscoveryPacket.cpp
b/src/add-ons/kernel/network/ppp/pppoe/DiscoveryPacket.cpp
index 74670c1..afb43c0 100644
--- a/src/add-ons/kernel/network/ppp/pppoe/DiscoveryPacket.cpp
+++ b/src/add-ons/kernel/network/ppp/pppoe/DiscoveryPacket.cpp
@@ -34,9 +34,9 @@ DiscoveryPacket::DiscoveryPacket(net_buffer *packet, uint32
start)
if(length > packet->size - PPPoE_HEADER_SIZE) {
dprintf("packet size less than pppoe payload\n");
- dprintf("pppoe payload:%d\n", length);
- dprintf("PPPoE_HEADER_SIZE:%d\n", PPPoE_HEADER_SIZE);
- dprintf("packet->size:%ld\n", packet->size);
+ dprintf("pppoe payload: %d\n", length);
+ dprintf("PPPoE_HEADER_SIZE: %d\n", PPPoE_HEADER_SIZE);
+ dprintf("packet->size: %" B_PRIu32 "\n", packet->size);
fInitStatus = B_ERROR;
return;
// there are no tags (or one corrupted tag)
diff --git a/src/add-ons/kernel/network/ppp/pppoe/PPPoEDevice.cpp
b/src/add-ons/kernel/network/ppp/pppoe/PPPoEDevice.cpp
index e749483..4849b9f 100644
--- a/src/add-ons/kernel/network/ppp/pppoe/PPPoEDevice.cpp
+++ b/src/add-ons/kernel/network/ppp/pppoe/PPPoEDevice.cpp
@@ -247,8 +247,8 @@ PPPoEDevice::Down()
return true;
}
+ // this tells StateMachine that DownEvent() does not mean we lost
connection
DownStarted();
- // this tells StateMachine that DownEvent() does not mean we
lost connection
// create PADT
DiscoveryPacket discovery(PADT, SessionID());
@@ -256,7 +256,8 @@ PPPoEDevice::Down()
net_buffer *packet = discovery.ToNetBuffer(MTU());
if (!packet) {
- ERROR("PPPoEDevice::Down(): ToNetBuffer() failed; MTU=%ld\n",
MTU());
+ ERROR("PPPoEDevice::Down(): ToNetBuffer() failed; MTU=%"
B_PRIu32 "\n",
+ MTU());
DownEvent();
return false;
}
diff --git a/src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile
b/src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile
index fe4cd26..eaee2cd 100644
--- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile
+++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile
@@ -19,14 +19,12 @@ UsePrivateHeaders [ FDirName kernel util ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared
libkernelppp headers ] : true ;
-
{
SubDirC++Flags -fno-rtti ;
}
KernelStaticLibrary libkernelppp.a :
- atomic.S
kernel_cpp.cpp
KPPPConfigurePacket.cpp
@@ -46,10 +44,7 @@ KernelStaticLibrary libkernelppp.a :
_KPPPMRUHandler.cpp
_KPPPAuthenticationHandler.cpp
_KPPPPFCHandler.cpp
- : -fno-pic
;
SEARCH on [ FGristFiles kernel_cpp.cpp ]
= [ FDirName $(HAIKU_TOP) src system kernel util ] ;
-SEARCH on [ FGristFiles atomic.S ]
- = [ FDirName $(HAIKU_TOP) src system libroot os arch $(TARGET_ARCH) ] ;
diff --git a/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPLCP.cpp
b/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPLCP.cpp
index 0191a90..578f7d5 100644
--- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPLCP.cpp
+++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPLCP.cpp
@@ -90,7 +90,7 @@ KPPPLCP::RemoveOptionHandler(KPPPOptionHandler *optionHandler)
KPPPOptionHandler*
KPPPLCP::OptionHandlerAt(int32 index) const
{
- dprintf("total optionhandler count %ld\n", CountOptionHandlers());
+ dprintf("total optionhandler count %" B_PRId32 "\n",
CountOptionHandlers());
KPPPOptionHandler *optionHandler = fOptionHandlers.ItemAt(index);
if (optionHandler == fOptionHandlers.GetDefaultItem())
@@ -164,7 +164,7 @@ KPPPLCP::RemoveLCPExtension(KPPPLCPExtension *lcpExtension)
KPPPLCPExtension*
KPPPLCP::LCPExtensionAt(int32 index) const
{
- dprintf("LCPExtension count %ld\n", CountLCPExtensions());
+ dprintf("LCPExtension count %" B_PRId32 "\n", CountLCPExtensions());
KPPPLCPExtension *lcpExtension = fLCPExtensions.ItemAt(index);
if (lcpExtension == fLCPExtensions.GetDefaultItem())
diff --git a/src/add-ons/kernel/network/ppp/shared/libkernelppp/TODO
b/src/add-ons/kernel/network/ppp/shared/libkernelppp/TODO
index a821855..300c33e 100644
--- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/TODO
+++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/TODO
@@ -1,3 +1,2 @@
-- remove atomic.S when Haiku is finished
- add missing settings support (ConnectRetryDelay, etc.)
- finish support for server mode
diff --git a/src/add-ons/kernel/network/ppp/shared/libppp/PPPManager.cpp
b/src/add-ons/kernel/network/ppp/shared/libppp/PPPManager.cpp
index 7ccc4c6..b42d05e 100644
--- a/src/add-ons/kernel/network/ppp/shared/libppp/PPPManager.cpp
+++ b/src/add-ons/kernel/network/ppp/shared/libppp/PPPManager.cpp
@@ -348,17 +348,19 @@ PPPManager::Interfaces(int32 *count,
while (true) {
requestCount = *count = CountInterfaces(filter);
if (*count <= 0) {
- printf("No interface, count, first round:%ld\n",
*count);
+ printf("No interface, count, first round: %" B_PRId32
"\n", *count);
return NULL;
}
requestCount += 10;
- // request some more interfaces in case some are added
in the mean time
+ // request some more interfaces in case some are added in the
mean time
interfaces = new ppp_interface_id[requestCount];
- // printf("interfaces addr: %p\n, requestCount: %ld",
interfaces, requestCount);
+
+ //printf("interfaces addr: %p\n, requestCount: %ld", interfaces,
+ // requestCount);
*count = GetInterfaces(interfaces, requestCount, filter);
if (*count <= 0) {
- printf("No interface, count second round:%ld\n",
*count);
+ printf("No interface, count second round: %" B_PRId32
"\n", *count);
delete interfaces;
return NULL;
}
