mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Merge remote-tracking branch 'tor-gitlab/mr/308' into maint-0.4.5
This commit is contained in:
commit
03c686563b
3
changes/ticket40295
Normal file
3
changes/ticket40295
Normal file
@ -0,0 +1,3 @@
|
||||
o Minor bugfixes (metrics port):
|
||||
- Fix a BUG() on the MetricsPort for an internal missing handler. Fixes bug
|
||||
40295; bugfix on 0.4.5.1-alpha.
|
@ -5187,6 +5187,8 @@ connection_finished_flushing(connection_t *conn)
|
||||
return connection_dir_finished_flushing(TO_DIR_CONN(conn));
|
||||
case CONN_TYPE_CONTROL:
|
||||
return connection_control_finished_flushing(TO_CONTROL_CONN(conn));
|
||||
case CONN_TYPE_METRICS:
|
||||
return metrics_connection_finished_flushing(conn);
|
||||
default:
|
||||
log_err(LD_BUG,"got unexpected conn type %d.", conn->type);
|
||||
tor_fragile_assert();
|
||||
|
@ -258,6 +258,15 @@ metrics_connection_reached_eof(connection_t *conn)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/** Called when conn has no more bytes left on its outbuf. Return 0 indicating
|
||||
* success. */
|
||||
int
|
||||
metrics_connection_finished_flushing(connection_t *conn)
|
||||
{
|
||||
tor_assert(conn);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/** Initialize the subsystem. */
|
||||
void
|
||||
metrics_init(void)
|
||||
|
@ -28,6 +28,7 @@ buf_t *metrics_get_output(const metrics_format_t fmt);
|
||||
/* Connection. */
|
||||
int metrics_connection_process_inbuf(struct connection_t *conn);
|
||||
int metrics_connection_reached_eof(struct connection_t *conn);
|
||||
int metrics_connection_finished_flushing(struct connection_t *conn);
|
||||
|
||||
/* Configuration. */
|
||||
int metrics_parse_ports(or_options_t *options, smartlist_t *ports,
|
||||
|
Loading…
Reference in New Issue
Block a user