@eyedeekay
&zzz
+R4SAS
+RN
+StormyCloud
+T3s|4
+dr|z3d
+hk
+orignal
+postman
+snex
+wodencafe
Arch
Danny
DeltaOreo
FreefallHeavens
Irc2PGuest11045
Irc2PGuest1389
Irc2PGuest27230
Irc2PGuest59134
Leopold
Onn4l7h
Onn4|7h
SigSegv
Sleepy
Soni
T3s|4_
acetone_
aeiou
ardu
b3t4f4c3___
bak83
cumlord
dickless1
dr4wd3_
enoxa
eyedeekay_bnc
hagen_
ka2
lbt_
mareki2p_
not_bob_afk
plap
poriori
profetik1
radakayot_
rapidash
shiver_
solidx66
theoddone
u5657
uop23ip
weko_
x74a6h
radakayot
should banlists for routers persist between restarts until their expiration? i did not see any related serialization code in ProfilePersistenceHelper.java.
radakayot
also i'm a little bit confused about being "unreachable" and being "banned". can somebody push me towards to a part of the code to help me understand?
dr|z3d
we persist bans for sybils, otherwise the bans generally expire on restart except for blocklist bans, which get reapplied as soon as offending routers are seen.
zzz
yeah you can't ban everyone forever or you will run out of memory
zzz
unreachable is like an outbound-only ban
zzz
dr|z3d, if I have an ancient branch for a WIP MR, how do I bring it up do date with trunk in git? something something rebase?
dr|z3d
you could just cherry-pick the commit(s)
dr|z3d
rebase, haven't really done much of that manually, though that's probably also an option.
dr|z3d
if you want to cherry-pick, get the commit id of the commits you want to merge, then switch to the branch you want to pull them into, then git cherry-pick {commit-id}
dr|z3d
to make the merge less painful, meld is recommended as your default diff/merge tool for git.
dr|z3d
to enable meld, you want something along the lines of the following in your ~/.gitconfig file:
dr|z3d
[diff]
dr|z3d
tool = meld
dr|z3d
path = /usr/bin/meld
dr|z3d
[difftool]
dr|z3d
prompt = false
dr|z3d
prompt = false
dr|z3d
[difftool "meld"]
zzz
no this is 6 months of commits
dr|z3d
cmd = meld "$LOCAL" "$REMOTE"
dr|z3d
[merge]
dr|z3d
tool = meld
dr|z3d
path = /usr/bin/meld
dr|z3d
[mergetool "meld"]
dr|z3d
cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
zzz
I'm hoping it merges cleanly
zzz
or should I just toss that branch and start over
dr|z3d
oh, well you probably don't want to be cherry-picking those. you can try git pull from the master branch in your dev branch first off. see if that complains.
dr|z3d
git branch foo then git pull master
dr|z3d
*git checkout branch foo
zzz
I already have foo
zzz
so git pull master will pull locally, not from gitlab?
dr|z3d
should do, assuming you have a 'master' branch locally.
dr|z3d
it'll probably complain, and give you some hints on how to resolve.
zzz
I think I do want rebase though because I want to move my changes from 6 months ago to "on top"
zzz
maybe somebody else knows about rebase and can help
dr|z3d
try 'git help rebase' for an authoritative guide.
zzz
I think git co foo; git rebase master; should do it
zzz
that worked
zzz
but gitlab wont let me push it
zzz
reading...
dr|z3d
you're probably trying to push to a non-existant remote branch?
zzz
no this is an old wip mr branch that is on gitlab
zzz
the hint is to use fast-forward
zzz
git push -f to force it worked.
dr|z3d
happy days \o/
zzz
not sure gitlab is happy though
dr|z3d
you'd be told "no" if it wasn't successful, or thereabouts :)
zzz
but the old MR vanished and it wants me to create a new one
dr|z3d
did it consolidate all your commits into a single commit id?
dr|z3d
git log locally should show you, in the 'foo' branch
zzz
local is ducky, it moved my commits to the top, but with the old date
zzz
so git log goes: june june june june february february ...
zzz
the old MR is nowhere to be found
zzz
and when I click on any existing MR the UI hangs
zzz
eyedeekay, I think I blew up gitlab (((
dr|z3d
something like this will set the date of the new (old) commits to today: git rebase --onto master <branch-point> <your-branch> --exec 'GIT_COMMITTER_DATE=$(date) git commit --amend --no-edit --reset-author'
zzz
ok
dr|z3d
otherwise, I don't think it's a huge deal, rebase by default retains the original commit date etc.
zzz
we usually squash commits on MR merge so it doesn't matter
zzz
eyedeekay, check gitlab CPU usage and it may need a restart. click on any MR
zzz
I think it does make sense that the old MR is gone and you have to create a new one?
zzz
but on github I see PRs rebased all the time so not sure why gitlab is different
dr|z3d
yeah, seems logical. you've effectively reverse merged the code.
dr|z3d
I try not to think too hard about git until there's a problem I need to resolve. :)
zzz
nvm eyedeekay, gitlab is back to life
radakayot
thank you for explaination zzz. so when in relay response should i return RELAY_REJECT_CHARLIE_BANNED if alice is unreachable? even if its unreachable because of frame timeouts?
zzz
that's all impl-specific policy, up to you, reason codes are mostly just for diagnostics, don't sweat which one
radakayot
oh, okay then. thanks again.
zzz
although for some of the banned reason codes, if you ban me I'll ban you back
radakayot
i saw in that code, i'll try to avoid that. 6 hours is too long :)
eyedeekay
Oh jeez missed those messages will look at the logs and see what the hubbub was
zzz
if you like, or not
zzz
eyedeekay, status of you and stormy working on the reseed, was gonna be friday night I think?
eyedeekay
Yeah we tried Friday but we couldn't get the schedule right to talk about it, I'll ping him again today and see when he's available
eyedeekay
In the meantime I'm trying to make very sure it's not my code that's wrong(pretty sure it isn't) and figure out what it actually is
zzz
yeah yours looks fine, his doesn't, I suspect he didn't really update or something is pointing to the old version
zzz
I'd start with something like reseed -v or whatever to spit out the version
eyedeekay
Yeah that's the most obvious and most likely correct theory
zzz
I think the remaining susidns MR is about the last of it for 2.8.1 and I'll propose a tag freeze next week and a release March 17
eyedeekay
That will all work for me schedule-wise, I should have a pretty open schedule both those weeks
eyedeekay
Speaking of git, github.com/go-i2p/go-gittisane has a guide to how I'm modding gitea to work with I2P and copies of the release artifacts I'll be using
eyedeekay
I'm working on a similar CI/CD setup for reseed-tools dev builds as well
zzz
bumper sticker seen today: Make Orwell Fiction Again
zzz
dr|z3d, the rebase I was working on was for the netdb map MR, I've been working on it a little and pushed 8 months of changes, now on MR 234
zzz
all the SVG stuff, animation, js, etc.
orignal
zzz, do you have sample routers signed with PQ?
orignal
openssl 3.5 alpha will be avaliable soon
zzz
no but I have sample privatekeyfile.dat files, link on my forum
zzz
haven't done anything with routerinfos
zzz
can probably generate some leasesets
orignal
ok. do you have something with PQ signature?
orignal
LS is fine
zzz
not yet, will put on the list
orignal
just a sample
orignal
to make sure that I can verify something signed by you
zzz
yup
zzz
back in the LS2 days I managed to export leasesets to disk, can't remember how I did it...
zzz
found it, this wont be too hard
orignal
thanks
orignal
let me know
zzz
^^ orignal
orignal
thanks
dr|z3d
zzz: re MR, nice, nice, I'll have a look.
zzz
this is all the stuff with switching to the SVG base map and SVG puker and doing incremental tunnel adds/removes in the SVG DOM
dr|z3d
yeah, I figured it was the geomap stuff.
dr|z3d
can you integrate it with my map? :)
dr|z3d
"no"
dr|z3d
*** grins. ***
dr|z3d
we've now got 3 separate datapoints on the + map, routers, X tier, and floodfill.
zzz
yeah I have it stubbed out for more map "modes", shouldnt be too hard
dr|z3d
shouldn't be.. I use a request param implemented with js (and buttons) to change the view, which currently reloads the map.
zzz
I'm not doing any js to do DOM popups like you do, still could
dr|z3d
you mean the tooltip? that also got fixed. it doesn't follow the pointer around now, it's static top left of the map. much nicer.
dr|z3d
*top right
zzz
ok
zzz
you may wish to take a look at ajaxchanges.js that does the incremental adds/deletes to the dom, pretty nifty
dr|z3d
looks like you grabbed the code from stackoverflow.
dr|z3d
:)
dr|z3d
why are you checking for MS activeX, otherwise? it's dead, jim!
zzz
pretty sure I did it from scratch, don't remember
dr|z3d
ok, well, you can forget about the IE ajax support stuff. no need.
zzz
this is a 22 year old project, plenty of cruft rattling aruond
zzz
ok
dr|z3d
you might also want to look at forEach, much nicer way of iterating over stuff than i++
dr|z3d
and those variable names, please! no!
zzz
not a js guy ofc
dr|z3d
give your variables descriptive names, not e1, e2 etc.
zzz
we don't have a js style guide, if you'd like to contribute one ))
zzz
I used to write C like it was fortran, then I wrote Java like it was C, now I write js like it's java. That's my programming career to date
dr|z3d
I noticed :)
zzz
finishing up my 20-year post, I assure you it will not reference fortran or js
dr|z3d
*** smiles ***
dr|z3d
for browser console logs, eg console.log, console.warn etc, I usually add a variable at the top of the script if I want to keep those, let debugging = {true|false}; then I can enable/disable them as required. if (debugging) {console.log("foo");}
zzz
yeah I just forgot to take it out
zzz
still WIP, not final
dr|z3d
re forEach, see the section "Converting a for loop to ForEach": developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach