Skip to content

gossip2, snaprd: plumbing for gossip2 to snaprd tile contact info updates #6003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+176 −69
Open

gossip2, snaprd: plumbing for gossip2 to snaprd tile contact info updates #6003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
235 changes: 171 additions & 64 deletions src/discof/restore/fd_snaprd_tile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include "../../disco/topo/fd_topo.h"
#include "../../disco/metrics/fd_metrics.h"
#include "../../flamenco/gossip/fd_gossip_types.h"

#include <errno.h>
#include <fcntl.h>
Expand Down Expand Up @@ -39,6 +40,10 @@

#define SNAPRD_FILE_BUF_SZ (1024UL*1024UL) /* 1 MiB */

#define IN_KIND_SNAPCTL (0)
#define IN_KIND_GOSSIP (1)
#define MAX_IN_LINKS (3)

struct fd_snaprd_tile {
fd_ssping_t * ssping;
fd_sshttp_t * sshttp;
Expand All @@ -64,6 +69,15 @@ struct fd_snaprd_tile {
int incremental_snapshot_fd;
} local_out;

struct {
fd_wksp_t * mem;
ulong chunk0;
ulong wmark;
ulong mtu;
} gossip_in;

uchar in_kind[ MAX_IN_LINKS ];

struct {
ulong full_snapshot_slot;
int full_snapshot_fd;
Expand Down Expand Up @@ -98,6 +112,11 @@ struct fd_snaprd_tile {
} incremental;
} metrics;

struct {
fd_ip4_port_t * ci_table;
fd_gossip_update_message_t tmp_upd_buf;
} gossip;

struct {
fd_wksp_t * wksp;
ulong chunk0;
Expand All @@ -121,6 +140,7 @@ scratch_footprint( fd_topo_tile_t const * tile ) {
l = FD_LAYOUT_APPEND( l, alignof(fd_snaprd_tile_t), sizeof(fd_snaprd_tile_t) );
l = FD_LAYOUT_APPEND( l, fd_sshttp_align(), fd_sshttp_footprint() );
l = FD_LAYOUT_APPEND( l, fd_ssping_align(), fd_ssping_footprint( 65536UL ) );
l = FD_LAYOUT_APPEND( l, alignof(fd_ip4_port_t), sizeof(fd_ip4_port_t)*FD_CONTACT_INFO_TABLE_SIZE );
return FD_LAYOUT_FINI( l, alignof(fd_snaprd_tile_t) );
}

Expand Down Expand Up @@ -204,7 +224,7 @@ read_http_data( fd_snaprd_tile_t * ctx,
case FD_SSHTTP_ADVANCE_AGAIN: break;
case FD_SSHTTP_ADVANCE_ERROR: {
FD_LOG_NOTICE(( "error downloading snapshot from http://" FD_IP4_ADDR_FMT ":%hu/snapshot.tar.bz2",
FD_IP4_ADDR_FMT_ARGS( ctx->addr.addr ), ctx->addr.port ));
FD_IP4_ADDR_FMT_ARGS( ctx->addr.addr ), fd_ushort_bswap( ctx->addr.port ) ));
fd_ssping_invalidate( ctx->ssping, ctx->addr, now );
fd_stem_publish( stem, 0UL, FD_SNAPSHOT_MSG_CTRL_RESET_FULL, 0UL, 0UL, 0UL, 0UL, 0UL );
ctx->state = FD_SNAPRD_STATE_FLUSHING_FULL_HTTP_RESET;
Expand Down Expand Up @@ -378,7 +398,7 @@ after_credit( fd_snaprd_tile_t * ctx,
FD_LOG_NOTICE(( "loading full snapshot from local file `%s`", ctx->local_in.full_snapshot_path ));
ctx->state = FD_SNAPRD_STATE_READING_FULL_FILE;
} else {
FD_LOG_NOTICE(( "downloading full snapshot from http://" FD_IP4_ADDR_FMT ":%hu/snapshot.tar.bz2", FD_IP4_ADDR_FMT_ARGS( best.addr ), best.port ));
FD_LOG_NOTICE(( "downloading full snapshot from http://" FD_IP4_ADDR_FMT ":%hu/snapshot.tar.bz2", FD_IP4_ADDR_FMT_ARGS( best.addr ), fd_ushort_bswap( best.port ) ));
ctx->addr = best;
ctx->state = FD_SNAPRD_STATE_READING_FULL_HTTP;
fd_sshttp_init( ctx->sshttp, best, "/snapshot.tar.bz2", 17UL, now );
Expand Down Expand Up @@ -445,7 +465,7 @@ after_credit( fd_snaprd_tile_t * ctx,
break;
}

FD_LOG_NOTICE(( "downloading incremental snapshot from http://" FD_IP4_ADDR_FMT ":%hu/incremental-snapshot.tar.bz2", FD_IP4_ADDR_FMT_ARGS( ctx->addr.addr ), ctx->addr.port ));
FD_LOG_NOTICE(( "downloading incremental snapshot from http://" FD_IP4_ADDR_FMT ":%hu/incremental-snapshot.tar.bz2", FD_IP4_ADDR_FMT_ARGS( ctx->addr.addr ), fd_ushort_bswap(ctx->addr.port) ));
fd_sshttp_init( ctx->sshttp, ctx->addr, "/incremental-snapshot.tar.bz2", 29UL, fd_log_wallclock() );
ctx->state = FD_SNAPRD_STATE_READING_INCREMENTAL_HTTP;
break;
Expand Down Expand Up @@ -474,6 +494,37 @@ after_credit( fd_snaprd_tile_t * ctx,
}
}

static int
before_frag( fd_snaprd_tile_t * ctx FD_PARAM_UNUSED,
ulong in_idx,
ulong seq FD_PARAM_UNUSED,
ulong sig ) {
if( ctx->in_kind[ in_idx ]==IN_KIND_GOSSIP ) {
return !( sig==FD_GOSSIP_UPDATE_TAG_CONTACT_INFO ||
sig==FD_GOSSIP_UPDATE_TAG_CONTACT_INFO_REMOVE ||
sig==FD_GOSSIP_UPDATE_TAG_SNAPSHOT_HASHES );
}
return 0;
}

static void
during_frag( fd_snaprd_tile_t * ctx,
ulong in_idx,
ulong seq FD_PARAM_UNUSED,
ulong sig FD_PARAM_UNUSED,
ulong chunk,
ulong sz,
ulong ctl FD_PARAM_UNUSED) {
if( ctx->in_kind[ in_idx ]!=IN_KIND_GOSSIP ) return;

if( FD_UNLIKELY( chunk<ctx->gossip_in.chunk0 ||
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check sz against mtu as well, see other tile examples

chunk>ctx->gossip_in.wmark ||
sz>sizeof(fd_gossip_update_message_t) ) ) {
FD_LOG_ERR(( "snaprd: unexpected chunk %lu", chunk ));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could use FD_TEST here for simplicity.

}
fd_memcpy( &ctx->gossip.tmp_upd_buf, fd_chunk_to_laddr( ctx->gossip_in.mem, chunk ), sz );
}

static void
after_frag( fd_snaprd_tile_t * ctx,
ulong in_idx,
Expand All @@ -489,50 +540,80 @@ after_frag( fd_snaprd_tile_t * ctx,
(void)tspub;
(void)sz;

FD_TEST( sig==FD_SNAPSHOT_MSG_CTRL_ACK || sig==FD_SNAPSHOT_MSG_CTRL_MALFORMED );

if( FD_LIKELY( sig==FD_SNAPSHOT_MSG_CTRL_ACK ) ) ctx->ack_cnt++;
else {
FD_TEST( ctx->state!=FD_SNAPRD_STATE_SHUTDOWN &&
ctx->state!=FD_SNAPRD_STATE_COLLECTING_PEERS &&
ctx->state!=FD_SNAPRD_STATE_WAITING_FOR_PEERS );

switch( ctx->state) {
case FD_SNAPRD_STATE_READING_FULL_FILE:
case FD_SNAPRD_STATE_FLUSHING_FULL_FILE:
case FD_SNAPRD_STATE_FLUSHING_FULL_FILE_RESET:
FD_LOG_ERR(( "error reading snapshot from local file `%s`", ctx->local_in.full_snapshot_path ));
case FD_SNAPRD_STATE_READING_INCREMENTAL_FILE:
case FD_SNAPRD_STATE_FLUSHING_INCREMENTAL_FILE:
FD_LOG_ERR(( "error reading snapshot from local file `%s`", ctx->local_in.incremental_snapshot_path ));
case FD_SNAPRD_STATE_READING_FULL_HTTP:
case FD_SNAPRD_STATE_READING_INCREMENTAL_HTTP:
FD_LOG_NOTICE(( "error downloading snapshot from http://" FD_IP4_ADDR_FMT ":%hu/snapshot.tar.bz2",
FD_IP4_ADDR_FMT_ARGS( ctx->addr.addr ), ctx->addr.port ));
fd_sshttp_cancel( ctx->sshttp );
fd_ssping_invalidate( ctx->ssping, ctx->addr, fd_log_wallclock() );
fd_stem_publish( stem, 0UL, FD_SNAPSHOT_MSG_CTRL_RESET_FULL, 0UL, 0UL, 0UL, 0UL, 0UL );
ctx->state = FD_SNAPRD_STATE_FLUSHING_FULL_HTTP_RESET;
break;
case FD_SNAPRD_STATE_FLUSHING_FULL_HTTP:
case FD_SNAPRD_STATE_FLUSHING_INCREMENTAL_HTTP:
FD_LOG_NOTICE(( "error downloading snapshot from http://" FD_IP4_ADDR_FMT ":%hu/snapshot.tar.bz2",
FD_IP4_ADDR_FMT_ARGS( ctx->addr.addr ), ctx->addr.port ));
fd_sshttp_cancel( ctx->sshttp );
fd_ssping_invalidate( ctx->ssping, ctx->addr, fd_log_wallclock() );
/* We would like to transition to FULL_HTTP_RESET, but we can't
do it just yet, because we have already sent a DONE control
fragment, and need to wait for acknowledges to come back
first, to ensure there's only one control message outstanding
at a time. */
ctx->malformed = 1;
if( FD_UNLIKELY( ctx->in_kind[ in_idx ]==IN_KIND_GOSSIP ) ) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I kinda think you can get away with matching the in_idx with a predefined constant.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Predefined based on ordering in topology.c? Isn't that a little fragile? Also the actual link set up in topology.c will come with the full gossip PR, so until then we don't have a constant (I guess a placeholder would work)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah... but the other tiles do it too? idk though up to you.

fd_gossip_update_message_t * msg = &ctx->gossip.tmp_upd_buf;
switch( msg->tag ) {
case FD_GOSSIP_UPDATE_TAG_CONTACT_INFO: {
fd_ip4_port_t cur_addr = ctx->gossip.ci_table[ msg->contact_info.idx ];
fd_ip4_port_t new_addr = msg->contact_info.contact_info->sockets[ FD_CONTACT_INFO_SOCKET_RPC ];
if( FD_UNLIKELY( cur_addr.l!=new_addr.l ) ) {
if( FD_LIKELY( !!cur_addr.l ) ) fd_ssping_remove( ctx->ssping, cur_addr );
if( FD_LIKELY( !!new_addr.l ) ) {
FD_LOG_INFO(( "adding contact info for peer "FD_IP4_ADDR_FMT ":%hu ",
FD_IP4_ADDR_FMT_ARGS( new_addr.addr ), fd_ushort_bswap( new_addr.port ) ));
fd_ssping_add( ctx->ssping, new_addr );
}
}
ctx->gossip.ci_table[ msg->contact_info.idx ] = new_addr;
}
break;
case FD_SNAPRD_STATE_FLUSHING_FULL_HTTP_RESET:
case FD_GOSSIP_UPDATE_TAG_CONTACT_INFO_REMOVE: {
fd_ip4_port_t addr = ctx->gossip.ci_table[ msg->contact_info_remove.idx ];
if( FD_LIKELY( !!addr.l ) ) fd_ssping_remove( ctx->ssping, addr );
ctx->gossip.ci_table[ msg->contact_info_remove.idx ].l = 0UL;
}
break;
default:
FD_LOG_ERR(( "unexpected state %d", ctx->state ));
case FD_GOSSIP_UPDATE_TAG_SNAPSHOT_HASHES:
/* TODO */
break;
}

} else {
FD_TEST( sig==FD_SNAPSHOT_MSG_CTRL_ACK || sig==FD_SNAPSHOT_MSG_CTRL_MALFORMED );

if( FD_LIKELY( sig==FD_SNAPSHOT_MSG_CTRL_ACK ) ) ctx->ack_cnt++;
else {
FD_TEST( ctx->state!=FD_SNAPRD_STATE_SHUTDOWN &&
ctx->state!=FD_SNAPRD_STATE_COLLECTING_PEERS &&
ctx->state!=FD_SNAPRD_STATE_WAITING_FOR_PEERS );

switch( ctx->state) {
case FD_SNAPRD_STATE_READING_FULL_FILE:
case FD_SNAPRD_STATE_FLUSHING_FULL_FILE:
case FD_SNAPRD_STATE_FLUSHING_FULL_FILE_RESET:
FD_LOG_ERR(( "error reading snapshot from local file `%s`", ctx->local_in.full_snapshot_path ));
case FD_SNAPRD_STATE_READING_INCREMENTAL_FILE:
case FD_SNAPRD_STATE_FLUSHING_INCREMENTAL_FILE:
FD_LOG_ERR(( "error reading snapshot from local file `%s`", ctx->local_in.incremental_snapshot_path ));
case FD_SNAPRD_STATE_READING_FULL_HTTP:
case FD_SNAPRD_STATE_READING_INCREMENTAL_HTTP:
FD_LOG_NOTICE(( "error downloading snapshot from http://" FD_IP4_ADDR_FMT ":%hu/snapshot.tar.bz2",
FD_IP4_ADDR_FMT_ARGS( ctx->addr.addr ), fd_ushort_bswap( ctx->addr.port ) ));
fd_sshttp_cancel( ctx->sshttp );
fd_ssping_invalidate( ctx->ssping, ctx->addr, fd_log_wallclock() );
fd_stem_publish( stem, 0UL, FD_SNAPSHOT_MSG_CTRL_RESET_FULL, 0UL, 0UL, 0UL, 0UL, 0UL );
ctx->state = FD_SNAPRD_STATE_FLUSHING_FULL_HTTP_RESET;
break;
case FD_SNAPRD_STATE_FLUSHING_FULL_HTTP:
case FD_SNAPRD_STATE_FLUSHING_INCREMENTAL_HTTP:
FD_LOG_NOTICE(( "error downloading snapshot from http://" FD_IP4_ADDR_FMT ":%hu/snapshot.tar.bz2",
FD_IP4_ADDR_FMT_ARGS( ctx->addr.addr ), fd_ushort_bswap( ctx->addr.port ) ));
fd_sshttp_cancel( ctx->sshttp );
fd_ssping_invalidate( ctx->ssping, ctx->addr, fd_log_wallclock() );
/* We would like to transition to FULL_HTTP_RESET, but we can't
do it just yet, because we have already sent a DONE control
fragment, and need to wait for acknowledges to come back
first, to ensure there's only one control message outstanding
at a time. */
ctx->malformed = 1;
break;
case FD_SNAPRD_STATE_FLUSHING_FULL_HTTP_RESET:
break;
default:
FD_LOG_ERR(( "unexpected state %d", ctx->state ));
break;
}
}
}
}

Expand Down Expand Up @@ -619,9 +700,10 @@ unprivileged_init( fd_topo_t * topo,
void * scratch = fd_topo_obj_laddr( topo, tile->tile_obj_id );

FD_SCRATCH_ALLOC_INIT( l, scratch );
fd_snaprd_tile_t * ctx = FD_SCRATCH_ALLOC_APPEND( l, alignof(fd_snaprd_tile_t), sizeof(fd_snaprd_tile_t) );
void * _sshttp = FD_SCRATCH_ALLOC_APPEND( l, fd_sshttp_align(), fd_sshttp_footprint() );
void * _ssping = FD_SCRATCH_ALLOC_APPEND( l, fd_ssping_align(), fd_ssping_footprint( 65536UL ) );
fd_snaprd_tile_t * ctx = FD_SCRATCH_ALLOC_APPEND( l, alignof(fd_snaprd_tile_t), sizeof(fd_snaprd_tile_t) );
void * _sshttp = FD_SCRATCH_ALLOC_APPEND( l, fd_sshttp_align(), fd_sshttp_footprint() );
void * _ssping = FD_SCRATCH_ALLOC_APPEND( l, fd_ssping_align(), fd_ssping_footprint( 65536UL ) );
void * _ci_table = FD_SCRATCH_ALLOC_APPEND( l, alignof(fd_ip4_port_t), sizeof(fd_ip4_port_t)*FD_CONTACT_INFO_TABLE_SIZE );

ctx->ack_cnt = 0UL;
ctx->malformed = 0;
Expand All @@ -646,27 +728,50 @@ unprivileged_init( fd_topo_t * topo,
ctx->sshttp = fd_sshttp_join( fd_sshttp_new( _sshttp ) );
FD_TEST( ctx->sshttp );

if( FD_LIKELY( !strcmp( tile->snaprd.cluster, "testnet" ) ) ) {
fd_ip4_port_t initial_peers[ 2UL ] = {
{ .addr = FD_IP4_ADDR( 35 , 214, 172, 227 ), .port = 8899 },
{ .addr = FD_IP4_ADDR( 145, 40 , 95 , 69 ), .port = 8899 }, /* Solana testnet peer */
};
for( ulong i=0UL; i<2UL; i++ ) fd_ssping_add( ctx->ssping, initial_peers[ i ] );
} else if( FD_LIKELY( !strcmp( tile->snaprd.cluster, "private" ) ) ) {
fd_ip4_port_t initial_peers[ 1UL ] = {
{ .addr = FD_IP4_ADDR( 147, 28, 185, 47 ), .port = 8899 } /* A private cluster peer */
};
for( ulong i=0UL; i<1UL; i++ ) fd_ssping_add( ctx->ssping, initial_peers[ i ] );
} else if (FD_LIKELY( !strcmp( tile->snaprd.cluster, "mainnet" ) ) ) {
ctx->gossip.ci_table = _ci_table;
/* zero-out memory so that we can perform null checks in after_frag */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you need to do this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would affect the if( FD_LIKELY( !!cur_addr.l ) ) checks in after_frag for a new entry

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should have issued a REMOVE first, so that line is pointless and should never be needed, right? It actually seems wrong because you might release an IP that wasn't in use from gossip

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should have issued a REMOVE first

CONTACT_INFO_REMOVE is only issued if a contact info was dropped from the Gossip table, not if only its RPC socket entry is removed. The removal of a valid contact info's RPC socket is communicated via the normal CONTACT_INFO update message. So we'd need null checks to track transitions (no addr > some addr, some addr > no addr, old addr > new addr)

fd_memset( ctx->gossip.ci_table, 0, sizeof(fd_ip4_port_t)*FD_CONTACT_INFO_TABLE_SIZE );

FD_TEST( tile->in_cnt<=MAX_IN_LINKS );
uchar has_gossip_in = 0;
for( ulong i=0UL; i<(tile->in_cnt); i++ ){
fd_topo_link_t * in_link = &topo->links[ tile->in_link_id[ i ] ];
if( 0==strcmp( in_link->name, "gossip_out" ) ) {
has_gossip_in = 1;
ctx->in_kind[ i ] = IN_KIND_GOSSIP;
ctx->gossip_in.mem = topo->workspaces[ topo->objs[ in_link->dcache_obj_id ].wksp_id ].wksp;
ctx->gossip_in.chunk0 = fd_dcache_compact_chunk0( ctx->gossip_in.mem, in_link->dcache );
ctx->gossip_in.wmark = fd_dcache_compact_wmark ( ctx->gossip_in.mem, in_link->dcache, in_link->mtu );
ctx->gossip_in.mtu = in_link->mtu;
} else if( 0==strcmp( in_link->name, "snapdc_rd" ) ||
0==strcmp( in_link->name, "snapin_rd" ) ) {
ctx->in_kind[ i ] = IN_KIND_SNAPCTL;
}
}

if( FD_UNLIKELY( !has_gossip_in ) ) {
FD_LOG_NOTICE(( "no gossip input link found, using initial peers for %s", tile->snaprd.cluster ));
if( FD_LIKELY( !strcmp( tile->snaprd.cluster, "testnet" ) ) ) {
fd_ip4_port_t initial_peers[ 2UL ] = {
{ .addr = FD_IP4_ADDR( 35 , 214, 172, 227 ), .port = fd_ushort_bswap(8899) },
{ .addr = FD_IP4_ADDR( 145, 40 , 95 , 69 ), .port = fd_ushort_bswap(8899) }, /* Solana testnet peer */
};
for( ulong i=0UL; i<2UL; i++ ) fd_ssping_add( ctx->ssping, initial_peers[ i ] );
} else if( FD_LIKELY( !strcmp( tile->snaprd.cluster, "private" ) ) ) {
fd_ip4_port_t initial_peers[ 1UL ] = {
{ .addr = FD_IP4_ADDR( 147, 28, 185, 47 ), .port = fd_ushort_bswap( 8899 ) } /* A private cluster peer */
};
for( ulong i=0UL; i<1UL; i++ ) fd_ssping_add( ctx->ssping, initial_peers[ i ] );
} else if (FD_LIKELY( !strcmp( tile->snaprd.cluster, "mainnet" ) ) ) {
fd_ip4_port_t initial_peers[ 3UL ] = {
{ .addr = FD_IP4_ADDR( 149, 255, 37 , 130 ), .port = 8899 },
{ .addr = FD_IP4_ADDR( 34 , 1 , 238, 227 ), .port = 8899 },
{ .addr = FD_IP4_ADDR( 34 , 1 , 139, 131 ), .port = 8899 }
{ .addr = FD_IP4_ADDR( 149, 255, 37 , 130 ), .port = fd_ushort_bswap( 8899 ) },
{ .addr = FD_IP4_ADDR( 34 , 1 , 238, 227 ), .port = fd_ushort_bswap( 8899 ) },
{ .addr = FD_IP4_ADDR( 34 , 1 , 139, 131 ), .port = fd_ushort_bswap( 8899 ) }
};
for( ulong i=0UL; i<3UL; i++ ) fd_ssping_add( ctx->ssping, initial_peers[ i ] );
}
else {
FD_LOG_ERR(( "unexpected cluster %s", tile->snaprd.cluster ));
} else {
FD_LOG_ERR(( "unexpected cluster %s", tile->snaprd.cluster ));
}
}

if( FD_UNLIKELY( tile->out_cnt!=1UL ) ) FD_LOG_ERR(( "tile `" NAME "` has %lu outs, expected 1", tile->out_cnt ));
Expand All @@ -687,6 +792,8 @@ unprivileged_init( fd_topo_t * topo,
#define STEM_CALLBACK_SHOULD_SHUTDOWN should_shutdown
#define STEM_CALLBACK_METRICS_WRITE metrics_write
#define STEM_CALLBACK_AFTER_CREDIT after_credit
#define STEM_CALLBACK_BEFORE_FRAG before_frag
#define STEM_CALLBACK_DURING_FRAG during_frag
#define STEM_CALLBACK_AFTER_FRAG after_frag

#include "../../disco/stem/fd_stem.c"
Expand Down
4 changes: 2 additions & 2 deletions src/discof/restore/utils/fd_sshttp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ fd_sshttp_init( fd_sshttp_t * http,

struct sockaddr_in addr_in = {
.sin_family = AF_INET,
.sin_port = fd_ushort_bswap( addr.port ),
.sin_port = addr.port,
.sin_addr = { .s_addr = addr.addr }
};

Expand Down Expand Up @@ -259,7 +259,7 @@ follow_redirect( fd_sshttp_t * http,
}

FD_LOG_NOTICE(( "following redirect to http://" FD_IP4_ADDR_FMT ":%hu%.*s",
FD_IP4_ADDR_FMT_ARGS( http->addr.addr ), http->addr.port,
FD_IP4_ADDR_FMT_ARGS( http->addr.addr ), fd_ushort_bswap( http->addr.port ),
(int)headers[ 0 ].value_len, headers[ 0 ].value ));

fd_sshttp_cancel( http );
Expand Down
6 changes: 3 additions & 3 deletions src/discof/restore/utils/fd_ssping.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ poll_advance( fd_ssping_t * ssping,
score_treap_ele_remove( ssping->score_treap, peer, ssping->pool );
}

FD_LOG_INFO(( "pinged " FD_IP4_ADDR_FMT ":%hu in %lu ns", FD_IP4_ADDR_FMT_ARGS( peer->addr.addr ), peer->addr.port, peer->latency_nanos ));
FD_LOG_INFO(( "pinged " FD_IP4_ADDR_FMT ":%hu in %lu ns", FD_IP4_ADDR_FMT_ARGS( peer->addr.addr ), fd_ushort_bswap(peer->addr.port), peer->latency_nanos ));
peer->state = PEER_STATE_VALID;
peer->deadline_nanos = now + PEER_DEADLINE_NANOS_VALID;

Expand All @@ -395,7 +395,7 @@ peer_connect( fd_ssping_t * ssping,

struct sockaddr_in addr = {
.sin_family = AF_INET,
.sin_port = fd_ushort_bswap( peer->addr.port ),
.sin_port = peer->addr.port,
.sin_addr = { .s_addr = peer->addr.addr }
};

Expand All @@ -422,7 +422,7 @@ fd_ssping_advance( fd_ssping_t * ssping,
while( !deadline_list_is_empty( ssping->unpinged, ssping->pool ) ) {
fd_ssping_peer_t * peer = deadline_list_ele_pop_head( ssping->unpinged, ssping->pool );

FD_LOG_INFO(( "pinging " FD_IP4_ADDR_FMT ":%hu", FD_IP4_ADDR_FMT_ARGS( peer->addr.addr ), peer->addr.port ));
FD_LOG_INFO(( "pinging " FD_IP4_ADDR_FMT ":%hu", FD_IP4_ADDR_FMT_ARGS( peer->addr.addr ), fd_ushort_bswap( peer->addr.port ) ));
int result = peer_connect( ssping, peer );
if( FD_UNLIKELY( -1==result ) ) {
peer->state = PEER_STATE_INVALID;
Expand Down
Loading