Skip to content

Commit 189c987

Browse files
committed
Showing local addresses on the Node Window
Adds a new row to the Node Window (debugwindow.ui) under the Network section which shows the LocalAddresses. fixes bitcoin#564
1 parent a5d7aff commit 189c987

File tree

2 files changed

+58
-11
lines changed

2 files changed

+58
-11
lines changed

src/qt/forms/debugwindow.ui

Lines changed: 46 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,41 @@
249249
</widget>
250250
</item>
251251
<item row="9" column="0">
252+
<widget class="QLabel" name="label_14">
253+
<property name="text">
254+
<string>Local Addresses</string>
255+
</property>
256+
</widget>
257+
</item>
258+
<item row="9" column="1" colspan="2">
259+
<widget class="QLabel" name="localAddresses">
260+
<property name="cursor">
261+
<cursorShape>IBeamCursor</cursorShape>
262+
</property>
263+
<property name="wordWrap">
264+
<bool>true</bool>
265+
</property>
266+
<property name="sizePolicy">
267+
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
268+
<horstretch>0</horstretch>
269+
<verstretch>0</verstretch>
270+
</sizepolicy>
271+
</property>
272+
<property name="text">
273+
<string notr="true">N/A</string>
274+
</property>
275+
<property name="textFormat">
276+
<enum>Qt::PlainText</enum>
277+
</property>
278+
<property name="textInteractionFlags">
279+
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
280+
</property>
281+
<property name="toolTip">
282+
<string>Network addresses that your Bitcoin node is currently using to communicate with other nodes.</string>
283+
</property>
284+
</widget>
285+
</item>
286+
<item row="10" column="0">
252287
<widget class="QLabel" name="label_10">
253288
<property name="font">
254289
<font>
@@ -261,14 +296,14 @@
261296
</property>
262297
</widget>
263298
</item>
264-
<item row="10" column="0">
299+
<item row="11" column="0">
265300
<widget class="QLabel" name="label_3">
266301
<property name="text">
267302
<string>Current block height</string>
268303
</property>
269304
</widget>
270305
</item>
271-
<item row="10" column="1" colspan="2">
306+
<item row="11" column="1" colspan="2">
272307
<widget class="QLabel" name="numberOfBlocks">
273308
<property name="cursor">
274309
<cursorShape>IBeamCursor</cursorShape>
@@ -284,14 +319,14 @@
284319
</property>
285320
</widget>
286321
</item>
287-
<item row="11" column="0">
322+
<item row="12" column="0">
288323
<widget class="QLabel" name="labelLastBlockTime">
289324
<property name="text">
290325
<string>Last block time</string>
291326
</property>
292327
</widget>
293328
</item>
294-
<item row="11" column="1" colspan="2">
329+
<item row="12" column="1" colspan="2">
295330
<widget class="QLabel" name="lastBlockTime">
296331
<property name="cursor">
297332
<cursorShape>IBeamCursor</cursorShape>
@@ -307,7 +342,7 @@
307342
</property>
308343
</widget>
309344
</item>
310-
<item row="12" column="0">
345+
<item row="13" column="0">
311346
<widget class="QLabel" name="labelMempoolTitle">
312347
<property name="font">
313348
<font>
@@ -320,14 +355,14 @@
320355
</property>
321356
</widget>
322357
</item>
323-
<item row="13" column="0">
358+
<item row="14" column="0">
324359
<widget class="QLabel" name="labelNumberOfTransactions">
325360
<property name="text">
326361
<string>Current number of transactions</string>
327362
</property>
328363
</widget>
329364
</item>
330-
<item row="13" column="1">
365+
<item row="14" column="1">
331366
<widget class="QLabel" name="mempoolNumberTxs">
332367
<property name="cursor">
333368
<cursorShape>IBeamCursor</cursorShape>
@@ -343,14 +378,14 @@
343378
</property>
344379
</widget>
345380
</item>
346-
<item row="14" column="0">
381+
<item row="15" column="0">
347382
<widget class="QLabel" name="labelMemoryUsage">
348383
<property name="text">
349384
<string>Memory usage</string>
350385
</property>
351386
</widget>
352387
</item>
353-
<item row="14" column="1">
388+
<item row="15" column="1">
354389
<widget class="QLabel" name="mempoolSize">
355390
<property name="cursor">
356391
<cursorShape>IBeamCursor</cursorShape>
@@ -366,7 +401,7 @@
366401
</property>
367402
</widget>
368403
</item>
369-
<item row="12" column="2" rowspan="3">
404+
<item row="13" column="2" rowspan="3">
370405
<layout class="QVBoxLayout" name="verticalLayoutDebugButton">
371406
<property name="spacing">
372407
<number>3</number>
@@ -406,7 +441,7 @@
406441
</item>
407442
</layout>
408443
</item>
409-
<item row="15" column="0">
444+
<item row="16" column="0">
410445
<spacer name="verticalSpacer">
411446
<property name="orientation">
412447
<enum>Qt::Vertical</enum>

src/qt/rpcconsole.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,18 @@ void RPCConsole::updateNetworkState()
975975
}
976976

977977
ui->numberOfConnections->setText(connections);
978+
979+
QString local_addresses;
980+
std::map<CNetAddr, LocalServiceInfo> hosts = clientModel->getNetLocalAddresses();
981+
for (const auto& [addr, info] : hosts) {
982+
local_addresses += QString::fromStdString(addr.ToStringAddr());
983+
if (!addr.IsI2P()) local_addresses += ":" + QString::number(info.nPort);
984+
local_addresses += ", ";
985+
}
986+
local_addresses.chop(2); // remove last ", "
987+
if (local_addresses.isEmpty()) local_addresses = tr("None");
988+
989+
ui->localAddresses->setText(local_addresses);
978990
}
979991

980992
void RPCConsole::setNumConnections(int count)

0 commit comments

Comments
 (0)