ludic.base's Queue<T> carries a QueueTag (its name and pending count): queue_new(name), q_push(q, v), q_drain(q), q_clear(q) take no BaseState, and core_undrained(tags) names the given queues still holding facts. A reducer on a package's state can now call that package's verbs (wallet_earn(wallet_st, n)). ludic migrate state --prune (ludicc --migrate-prune) takes out each state parameter a function no longer uses, nor anything it calls, and the argument that fills it - including an argument for a parameter the callee has dropped, which is taken out before the call is checked, so a generic's T is told by the argument that says it. A reducer keeps its state. --dry-run now counts the edits it would make. Every package was moved with it: 608 base_st parameters and their arguments, 1889 edits. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
47 lines
1.9 KiB
Text
47 lines
1.9 KiB
Text
# room_connect.ludic - the matchmaker's answer: a guest dials the host it named (or is out),
|
|
# and leaving lets the room go
|
|
# the matchmaker let this machine down: a guest is out, a host keeps its code-less party
|
|
function net__room_fail(net_st: mut NetState, why: int) -> void {
|
|
net__log(`matchmaker: {why}`)
|
|
let was_guest = net_st.net__r_role == 2
|
|
let room = net_st.net__room
|
|
net_st.net__r_state = NET_R_IDLE
|
|
net_st.net__r_role = 0
|
|
if was_guest { net__lose_with(net_st, why, room) } else { net__fact(net_st, NET_ROOM_FAILED, -1, 0, why, room) }
|
|
}
|
|
|
|
# the guest: to the host's outside address, or its inside one behind the same router
|
|
function net__room_connect(net_st: mut NetState, host_pub: string, host_local: string) -> void {
|
|
var target = host_pub
|
|
var same_router = false
|
|
if len(host_pub) > 0 and net_st.net__pub_ip != 0 and net_parse_code(net_st, host_pub) and net_st.net__code_ip == net_st.net__pub_ip { same_router = true }
|
|
if len(host_pub) == 0 or same_router { target = host_local }
|
|
if not net_parse_code(net_st, target) {
|
|
net__room_fail(net_st, NET_WHY_BAD_ADDRESS)
|
|
return
|
|
}
|
|
net_st.net__r_state = NET_R_DONE
|
|
net_st.net__r_t = 0.0
|
|
net_st.net__state = NET_IDLE # net_join wants a fresh start
|
|
net_join(net_st, net_st.net__code_ip, net_st.net__code_port)
|
|
net_st.net__dial_heard = net_st.net__peers[0].heard
|
|
if net__conf(net_st).force_relay and net_st.net__relay_ip != 0 { # a test of the relay alone
|
|
net__use_relay(net_st)
|
|
return
|
|
}
|
|
net__log(`room {net_st.net__room}: dialling {target}`)
|
|
}
|
|
|
|
function net__room_reset(net_st: mut NetState) -> void {
|
|
if net_st.net__http != 0 {
|
|
Http.free(net_st.net__http)
|
|
net_st.net__http = 0
|
|
}
|
|
net_st.net__r_state = NET_R_IDLE
|
|
net_st.net__r_role = 0
|
|
net_st.net__room = ""
|
|
net_st.net__via_relay = false
|
|
net_st.net__relay_ip = 0
|
|
net_st.net__relay_port = 0
|
|
net__punch_clear(net_st)
|
|
}
|