aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-23 00:54:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightningd: append (as much as we can) version into default name if DEVELOPER=1

Browse Source 
This helps for bug reporting, where we may need to diagnose the other
end.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-02-22 20:30:33 +10:30
committed by Christian Decker
parent 655ae90e5e
commit 85f1a9b825
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lightningd/options.c
View File

@@ -608,16 +608,30 @@ void setup_color_and_alias(struct lightningd *ld)
if (!ld->alias) { if (!ld->alias) {
u64 adjective, noun; u64 adjective, noun;
char *name;
memcpy(&adjective, der+3, sizeof(adjective)); memcpy(&adjective, der+3, sizeof(adjective));
memcpy(&noun, der+3+sizeof(adjective), sizeof(noun)); memcpy(&noun, der+3+sizeof(adjective), sizeof(noun));
noun %= ARRAY_SIZE(codename_noun); noun %= ARRAY_SIZE(codename_noun);
adjective %= ARRAY_SIZE(codename_adjective); adjective %= ARRAY_SIZE(codename_adjective);
/* Only use 32 characters */
name = tal_fmt(ld, "%s%s-",
codename_adjective[adjective],
codename_noun[noun]);
#if DEVELOPER
assert(strlen(name) < 32);
int taillen = 32 - strlen(name);
if (taillen > strlen(version()))
taillen = strlen(version());
/* Fit as much of end of version() as possible */
tal_append_fmt(&name, "%s",
version() + strlen(version()) - taillen);
#endif
assert(strlen(name) <= 32);
ld->alias = tal_arrz(ld, u8, 33); ld->alias = tal_arrz(ld, u8, 33);
assert(strlen(codename_adjective[adjective]) strcpy((char*)ld->alias, name);
+ strlen(codename_noun[noun]) < 33); tal_free(name);
strcpy((char*)ld->alias, codename_adjective[adjective]);
strcat((char*)ld->alias, codename_noun[noun]);
} }
} }

4
tests/test_lightningd.py
View File

@@ -1763,13 +1763,13 @@ class LightningDTests(BaseLightningDTests):
# Might not have seen other node-announce yet. # Might not have seen other node-announce yet.
# TODO(cdecker) Can't check these without DEVELOPER=1, re-enable after we get alias and color into getinfo # TODO(cdecker) Can't check these without DEVELOPER=1, re-enable after we get alias and color into getinfo
if DEVELOPER: if DEVELOPER:
assert n1['alias'] == 'JUNIORBEAM' assert n1['alias'].startswith('JUNIORBEAM')
assert n1['color'] == '0266e4' assert n1['color'] == '0266e4'
if 'alias' not in n2: if 'alias' not in n2:
assert 'color' not in n2 assert 'color' not in n2
assert 'addresses' not in n2 assert 'addresses' not in n2
else: else:
assert n2['alias'] == 'SILENTARTIST' assert n2['alias'].startswith('SILENTARTIST')
assert n2['color'] == '022d22' assert n2['color'] == '022d22'
assert [c['active'] for c in l1.rpc.listchannels()['channels']] == [True, True] assert [c['active'] for c in l1.rpc.listchannels()['channels']] == [True, True]