Skip to content

Rearrange tor and tgen configuration files#17

Merged
stevenengler merged 7 commits intoshadow:mainfrom
stevenengler:rearrange-configs
Jun 24, 2021
Merged

Rearrange tor and tgen configuration files#17
stevenengler merged 7 commits intoshadow:mainfrom
stevenengler:rearrange-configs

Conversation

@stevenengler
Copy link
Copy Markdown
Contributor

@stevenengler stevenengler commented Jun 23, 2021

Closes #15, and also rearrange the tgen markov client configuration files to store them in the hosts directory rather than the conf directory.

@stevenengler stevenengler added the enhancement New feature or request label Jun 23, 2021
@stevenengler stevenengler self-assigned this Jun 23, 2021
@stevenengler stevenengler requested a review from robgjansen June 23, 2021 19:38
Copy link
Copy Markdown
Member

@robgjansen robgjansen left a comment

Choose a reason for hiding this comment

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

Looks plausible!

It's a bit hard to tell the structure of everything without actually running the code to generate a new config structure. Should I do that as a sanity check?

Also, do you think this change is big enough that we should run a trial Tor experiment to make sure the experiment runs as expected?

TGENRC_MARKOVCLIENT_DIRNAME="tgen-markov"
TGENRC_MARKOVCLIENT_FILENAME_FMT="{}.tgenrc.graphml"
TGENRC_MARKOVCLIENT_FILENAME="tgenrc.graphml"
TGENRC_FLOWMODEL_FILENAME_FMT="flowmodel.{}usec.graphml"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nit: should we use this instead to be consistent with the stream and packet model names?

TGENRC_FLOWMODEL_FILENAME_FMT="tgen.tor-flowmodel-{}usec.graphml"

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done.

@stevenengler
Copy link
Copy Markdown
Contributor Author

stevenengler commented Jun 24, 2021

Also, do you think this change is big enough that we should run a trial Tor experiment to make sure the experiment runs as expected?

I ran a 0.1% network and Shadow completed successfully. I'll run another one before merging and I'll double check that the log files look okay.

Edit: I ran a 1% network for 30 sim minutes and everything looks fine to me.

@stevenengler stevenengler merged commit 13bfe33 into shadow:main Jun 24, 2021
@stevenengler stevenengler deleted the rearrange-configs branch June 24, 2021 18:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Re-organize torrc files for usability

2 participants