Commit 593fde93 authored by teor's avatar teor
Browse files

sr: rename srv_dup() to sr_srv_dup()

parent 26e6f560

src/or/shared_random.c

+3 −3
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static int32_t num_srv_agreements_from_vote; 


/* Return a heap allocated copy of the SRV <b>orig</b>. */

sr_srv_t *

srv_dup(const sr_srv_t *orig)

sr_srv_dup(const sr_srv_t *orig)

{

  sr_srv_t *duplicate = NULL;
@@ -1318,8 +1318,8 @@ sr_act_post_consensus(const networkstatus_t *consensus) 
     * decided by the majority. */

    sr_state_unset_fresh_srv();

    /* Set the SR values from the given consensus. */

    sr_state_set_previous_srv(srv_dup(consensus->sr_info.previous_srv));

    sr_state_set_current_srv(srv_dup(consensus->sr_info.current_srv));

    sr_state_set_previous_srv(sr_srv_dup(consensus->sr_info.previous_srv));

    sr_state_set_current_srv(sr_srv_dup(consensus->sr_info.current_srv));

  }



  /* Prepare our state so that it's ready for the next voting period. */

src/or/shared_random.h

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ const char *sr_commit_get_rsa_fpr(const sr_commit_t *commit) 
void sr_compute_srv(void);

sr_commit_t *sr_generate_our_commit(time_t timestamp,

                                    const authority_cert_t *my_rsa_cert);

sr_srv_t *srv_dup(const sr_srv_t *orig);

sr_srv_t *sr_srv_dup(const sr_srv_t *orig);



#ifdef SHARED_RANDOM_PRIVATE

src/or/shared_random_state.c

+1 −1
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ state_rotate_srv(void) 
  /* First delete previous SRV from the state. Object will be freed. */

  state_del_previous_srv();

  /* Set previous SRV to a copy of the current one. */

  sr_state_set_previous_srv(srv_dup(sr_state_get_current_srv()));

  sr_state_set_previous_srv(sr_srv_dup(sr_state_get_current_srv()));

  /* Free and NULL the current srv. */

  sr_state_set_current_srv(NULL);

}

src/test/test_shared_random.c

+4 −4
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ test_utils(void *arg) 
{

  (void) arg;



  /* Testing srv_dup(). */

  /* Testing sr_srv_dup(). */

  {

    sr_srv_t *srv = NULL, *dup_srv = NULL;

    const char *srv_value =
@@ -940,7 +940,7 @@ test_utils(void *arg) 
    srv = tor_malloc_zero(sizeof(*srv));

    srv->num_reveals = 42;

    memcpy(srv->value, srv_value, sizeof(srv->value));

    dup_srv = srv_dup(srv);

    dup_srv = sr_srv_dup(srv);

    tt_assert(dup_srv);

    tt_u64_op(dup_srv->num_reveals, ==, srv->num_reveals);

    tt_mem_op(dup_srv->value, OP_EQ, srv->value, sizeof(srv->value));
@@ -1055,7 +1055,7 @@ test_state_transition(void *arg) 
    test_sr_setup_srv(1);

    tt_assert(sr_state_get_current_srv());

    /* Take a copy of the data, because the state owns the pointer */

    cur = srv_dup(sr_state_get_current_srv());

    cur = sr_srv_dup(sr_state_get_current_srv());

    tt_assert(cur);

    /* After, the previous SRV should be the same as the old current SRV, and

     * the current SRV should be set to NULL */
@@ -1073,7 +1073,7 @@ test_state_transition(void *arg) 
    test_sr_setup_srv(1);

    tt_assert(sr_state_get_current_srv());

    /* Take a copy of the data, because the state owns the pointer */

    cur = srv_dup(sr_state_get_current_srv());

    cur = sr_srv_dup(sr_state_get_current_srv());

    set_sr_phase(SR_PHASE_REVEAL);

    MOCK(get_my_v3_authority_cert, get_my_v3_authority_cert_m);

    new_protocol_run(now);