mirror of
https://github.com/zeek/zeek.git
synced 2025-10-07 17:18:20 +00:00
Merge remote branch 'remotes/origin/topic/policy-scripts-new'
* remotes/origin/topic/policy-scripts-new: (264 commits) Update core.vlan-mpls baseline. Update core.conn-uid test/baseline. Fixing tests / updating baselines. Renaming a poorly named notice. Resolving a conflict in scan.l. Notice framework updates. Fixed bug I just introduced to known-services. Known services now only logs for "normal" connections. Fix the name of the DPD log. Updating the netstats script to match the new internal code. Removed expected_connection_timeout variable. New default notice actions for emailing network admins. New default notice action for emailing network admins. weird.bro moved into notice framework. Removed a redundant and out of place mozilla CA list. Renamed the stream for the notice log. Small consistency tweaks for the communications framework. Finishing the inactivity script. Intel framework test passes now. Reorganized some of the tests for consistency. ...
This commit is contained in:
commit
a5e13b184d
427 changed files with 9916 additions and 16713 deletions
21
src/BroDoc.h
21
src/BroDoc.h
|
@ -22,10 +22,15 @@ public:
|
|||
* the filename of the Bro script that generates it, except any
|
||||
* ".bro" file extension is stripped and ".rst" takes it place.
|
||||
* If the filename doesn't end in ".bro", then ".rst" is just appended.
|
||||
* @param sourcename The name of the Bro script for which to generate
|
||||
* documentation. May contain a path.
|
||||
* Any '/' characters in the reST file name that result from choice of
|
||||
* the 'rel' parameter are replaced with '^'.
|
||||
* @param rel A string representing the path relative to BROPATH off of
|
||||
* which the source file is loaded or generally any filesystem
|
||||
* path to a Bro script. May or may not have .bro file extension.
|
||||
* @param abs The absolute path to the Bro script for which to generate
|
||||
* documentation.
|
||||
*/
|
||||
BroDoc(const std::string& sourcename);
|
||||
BroDoc(const std::string& rel, const std::string& abs);
|
||||
|
||||
/**
|
||||
* BroDoc destructor
|
||||
|
@ -203,7 +208,8 @@ public:
|
|||
protected:
|
||||
FILE* reST_file;
|
||||
std::string reST_filename;
|
||||
std::string source_filename;
|
||||
std::string source_filename; // points to the basename of source file
|
||||
std::string doc_title;
|
||||
std::string packet_filter;
|
||||
|
||||
std::list<std::string> modules;
|
||||
|
@ -357,6 +363,13 @@ private:
|
|||
{
|
||||
return ! o->IsPublicAPI();
|
||||
}
|
||||
|
||||
struct replace_slash {
|
||||
void operator()(char& c)
|
||||
{
|
||||
if ( c == '/' ) c = '^';
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue