[haiku-commits] r40921 - haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 12 Mar 2011 00:31:11 +0100 (CET)
Author: kallisti5
Date: 2011-03-12 00:31:11 +0100 (Sat, 12 Mar 2011)
New Revision: 40921
Changeset: http://dev.haiku-os.org/changeset/40921
Modified:
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesAddOn.cpp
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesAddOn.h
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/NetworkSettings.cpp
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/NetworkSettings.h
Log:
change Heal to Renegotiate for now as it is the most technically correct; add
missing delete of fNetworkInterface from deconstructor; remove un-needed
RemoveDefaultRoute as per Axel
Modified:
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesAddOn.cpp
===================================================================
--- haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesAddOn.cpp
2011-03-11 20:17:10 UTC (rev 40920)
+++ haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesAddOn.cpp
2011-03-11 23:31:11 UTC (rev 40921)
@@ -80,9 +80,9 @@
new BMessage(kMsgInterfaceToggle));
fOnOff->SetEnabled(false);
- fHeal = new BButton(intViewRect, "heal",
- "Heal", new BMessage(kMsgInterfaceHeal));
- fHeal->SetEnabled(false);
+ fRenegotiate = new BButton(intViewRect, "heal",
+ "Renegotiate", new BMessage(kMsgInterfaceRenegotiate));
+ fRenegotiate->SetEnabled(false);
// Build the layout
SetLayout(new BGroupLayout(B_VERTICAL));
@@ -93,7 +93,7 @@
.Add(fConfigure)
.Add(fOnOff)
.AddGlue()
- .Add(fHeal)
+ .Add(fRenegotiate)
.End()
.SetInsets(10, 10, 10, 10)
);
@@ -109,7 +109,7 @@
fListview->SetTarget(this);
fConfigure->SetTarget(this);
fOnOff->SetTarget(this);
- fHeal->SetTarget(this);
+ fRenegotiate->SetTarget(this);
}
@@ -135,11 +135,11 @@
{
fConfigure->SetEnabled(item != NULL);
fOnOff->SetEnabled(item != NULL);
- fHeal->SetEnabled(item != NULL);
+ fRenegotiate->SetEnabled(item != NULL);
if (!item)
break;
fConfigure->SetEnabled(!item->IsDisabled());
- fHeal->SetEnabled(!item->IsDisabled());
+ fRenegotiate->SetEnabled(!item->IsDisabled());
fOnOff->SetLabel(item->IsDisabled() ? "Enable" :
"Disable");
break;
}
@@ -162,18 +162,18 @@
item->SetDisabled(!item->IsDisabled());
fConfigure->SetEnabled(!item->IsDisabled());
fOnOff->SetLabel(item->IsDisabled() ? "Enable" :
"Disable");
- fHeal->SetEnabled(!item->IsDisabled());
+ fRenegotiate->SetEnabled(!item->IsDisabled());
fListview->Invalidate();
break;
}
- case kMsgInterfaceHeal:
+ case kMsgInterfaceRenegotiate:
{
if (!item)
break;
NetworkSettings* ns = item->GetSettings();
- ns->HealInterface();
+ ns->RenegotiateAddresses();
break;
}
Modified:
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesAddOn.h
===================================================================
--- haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesAddOn.h
2011-03-11 20:17:10 UTC (rev 40920)
+++ haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesAddOn.h
2011-03-11 23:31:11 UTC (rev 40921)
@@ -23,7 +23,7 @@
static const uint32 kMsgInterfaceSelected = 'ifce';
static const uint32 kMsgInterfaceConfigure = 'ifcf';
static const uint32 kMsgInterfaceToggle = 'onof';
-static const uint32 kMsgInterfaceHeal = 'heal';
+static const uint32 kMsgInterfaceRenegotiate = 'redo';
class InterfacesAddOn : public NetworkSetupAddOn, public BBox
@@ -44,7 +44,7 @@
InterfacesListView* fListview;
BButton* fConfigure;
BButton* fOnOff;
- BButton* fHeal;
+ BButton* fRenegotiate;
};
Modified:
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/NetworkSettings.cpp
===================================================================
--- haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/NetworkSettings.cpp
2011-03-11 20:17:10 UTC (rev 40920)
+++ haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/NetworkSettings.cpp
2011-03-11 23:31:11 UTC (rev 40921)
@@ -58,6 +58,8 @@
close(socket_id);
}
+
+ delete fNetworkInterface;
}
@@ -332,20 +334,17 @@
}
-/*! HealInterface performs a address renegotiation in an attempt to fix
+/*! RenegotiateAddresses performs a address renegotiation in an attempt to fix
connectivity problems
*/
status_t
-NetworkSettings::HealInterface()
+NetworkSettings::RenegotiateAddresses()
{
for (int index = 0; index < MAX_PROTOCOLS; index++) {
int inet_id = fProtocols[index].inet_id;
if (fProtocols[index].present
&& AutoConfigure(inet_id)) {
// If protocol is active, and set to auto
- printf("Healing %d\n", inet_id);
- fNetworkInterface->RemoveDefaultRoute(inet_id);
- // Remove default route
fNetworkInterface->AutoConfigure(inet_id);
// Perform AutoConfiguration
}
Modified:
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/NetworkSettings.h
===================================================================
--- haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/NetworkSettings.h
2011-03-11 20:17:10 UTC (rev 40920)
+++ haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/NetworkSettings.h
2011-03-11 23:31:11 UTC (rev 40921)
@@ -59,8 +59,6 @@
void SetDisabled(bool
disabled)
{
fDisabled = disabled; }
- status_t HealInterface();
-
// void
SetWirelessNetwork(const char* name)
// {
fWirelessNetwork.SetTo(name); }
// void SetDomain(const
BString& domain)
@@ -80,6 +78,7 @@
int32 PrefixLen(int family)
{
return fNetmask[family].PrefixLength(); }
+ status_t RenegotiateAddresses();
const char* Name() { return
fName.String(); }
const char* Domain() { return
fDomain.String(); }
Other related posts:
