Opened 3 months ago

Closed 2 months ago

#30769 closed defect (fixed)

Rename one of the two sendme.h files

Reported by: nickm Owned by: dgoulet
Priority: Medium Milestone: Tor: 0.4.1.x-final
Component: Core Tor/Tor Version:
Severity: Normal Keywords: 041-should asn-merge
Cc: dgoulet Actual Points: 0.1
Parent ID: Points: 0.1
Reviewer: nickm Sponsor:

Description

We have a convention that, to avoid confusion, two directories should never have headers with the same name. Our rectify_include_paths.py tool takes advantage of this fact to find a canonical path for each header. But in 0.4.1, we now have two conflicting headers:

./src/core/or/sendme.h
./src/trunnel/sendme.h

Let's rename one of these.

Child Tickets

Change History (7)

comment:1 Changed 3 months ago by dgoulet

Actual Points: 0.1
Status: newneeds_review

Branch: ticket30769_041_01
PR: https://github.com/torproject/tor/pull/1073

comment:2 Changed 3 months ago by nickm

Reviewer: nickm
Status: needs_reviewneeds_revision

This uses an older version of Trunnel, which would cause openbsd regressions. Please rebuild with trunnel >= 1.5.3, then call it merge_ready?

comment:3 Changed 3 months ago by dgoulet

Status: needs_revisionmerge_ready

Done!

Funny! I thought for some weird reasons that run_trunnel.sh would take trunnel in the git path "../trunnel". No idea why I thought that.

Everything is up to date now! Good to know.

comment:4 Changed 3 months ago by nickm

Keywords: asn-merge added

LGTM.

comment:5 Changed 3 months ago by nickm

Owner: set to dgoulet
Status: merge_readyassigned

Setting owner.

comment:6 Changed 3 months ago by nickm

Status: assignedmerge_ready

comment:7 Changed 2 months ago by asn

Resolution: fixed
Status: merge_readyclosed

Merged to 042.

Note: See TracTickets for help on using tickets.