X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Finspircd.h;h=35183c3bf61919b4a8337c0f514414cd5d6c6b98;hb=9982ec4e5b027ed24b1fda5e6fd3ab35b98de1a7;hp=934f2f82bca4510760dbaf5c4859f024a6f67f8b;hpb=c6e40d36b42a7ebf832c3a57d2816a47ee9c9a76;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index 934f2f82b..35183c3bf 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -25,6 +25,10 @@
 
 #pragma once
 
+// If the system has a pre-C11 stdint header this must be defined in
+// order to use the numeric limit macros.
+#define __STDC_LIMIT_MACROS
+
 #include <cfloat>
 #include <climits>
 #include <cmath>
@@ -284,7 +288,7 @@ class CoreExport InspIRCd
 	 */
 	TimerManager Timers;
 
-	/** X-Line manager. Handles G/K/Q/E line setting, removal and matching
+	/** X-line manager. Handles G/K/Q/E-line setting, removal and matching
 	 */
 	XLineManager* XLines;
 
@@ -300,7 +304,7 @@ class CoreExport InspIRCd
 	 */
 	std::vector<ListenSocket*> ports;
 
-	/** Set to the current signal recieved
+	/** Set to the current signal received
 	 */
 	static sig_atomic_t s_signal;
 
@@ -348,9 +352,9 @@ class CoreExport InspIRCd
 	static void DefaultGenRandom(char* output, size_t max);
 
 	/** Bind to a specific port from a config tag.
-	 * @param Tag the tag that contains bind information.
+	 * @param tag the tag that contains bind information.
 	 * @param sa The endpoint to listen on.
-	 * @params old_ports Previously listening ports that may be on the same endpoint.
+	 * @param old_ports Previously listening ports that may be on the same endpoint.
 	 */
 	bool BindPort(ConfigTag* tag, const irc::sockets::sockaddrs& sa, std::vector<ListenSocket*>& old_ports);
 
@@ -403,12 +407,12 @@ class CoreExport InspIRCd
 	static bool IsSID(const std::string& sid);
 
 	/** Handles incoming signals after being set
-	 * @param signal the signal recieved
+	 * @param signal the signal received
 	 */
 	void SignalHandler(int signal);
 
-	/** Sets the signal recieved
-	 * @param signal the signal recieved
+	/** Sets the signal received
+	 * @param signal the signal received
 	 */
 	static void SetSignal(int signal);
 
@@ -502,6 +506,26 @@ class CoreExport InspIRCd
 	 */
 	static unsigned long Duration(const std::string& str);
 
+	/** Calculate a duration in seconds from a string in the form 1y2w3d4h6m5s
+	 * @param str A string containing a time in the form 1y2w3d4h6m5s
+	 * (one year, two weeks, three days, four hours, six minutes and five seconds)
+	 * @param duration The location to place the parsed duration valur
+	 * @return Whether the duration was a valid format or not
+	 */
+	static bool Duration(const std::string& str, unsigned long& duration);
+
+	/** Determines whether a string contains a valid duration.
+	 * @param str A string containing a time in the form 1y2w3d4h6m5s
+	 * @return True if the string is a valid duration; otherwise, false.
+	 */
+	static bool IsValidDuration(const std::string& str);
+
+	/** Return a duration in seconds as a human-readable string.
+	 * @param duration The duration in seconds to convert to a human-readable string.
+	 * @return A string representing the given duration.
+	 */
+	static std::string DurationString(time_t duration);
+
 	/** Attempt to compare a password to a string from the config file.
 	 * This will be passed to handling modules which will compare the data
 	 * against possible hashed equivalents in the input string.