diff --git a/opsb.c b/opsb.c index 9b7e58b..6e84aba 100644 --- a/opsb.c +++ b/opsb.c @@ -75,13 +75,13 @@ ModuleInfo module_info = { static bot_cmd opsb_commands[]= { - {"STATUS", opsb_cmd_status, 0, NS_ULEVEL_OPER, opsb_help_status, opsb_help_status_oneline}, - {"REMOVE", opsb_cmd_remove, 1, NS_ULEVEL_OPER, opsb_help_remove, opsb_help_remove_oneline}, - {"CHECK", opsb_cmd_check, 1, NS_ULEVEL_OPER, opsb_help_check, opsb_help_check_oneline}, - {"ADD", opsb_cmd_add, 3, NS_ULEVEL_ADMIN, opsb_help_add, opsb_help_add_oneline}, - {"DEL", opsb_cmd_del, 1, NS_ULEVEL_ADMIN, opsb_help_del, opsb_help_del_oneline}, - {"LIST", opsb_cmd_list, 0, NS_ULEVEL_ADMIN, opsb_help_list, opsb_help_list_oneline}, - {NULL, NULL, 0, 0, NULL, NULL} + {"STATUS", opsb_cmd_status, 0, NS_ULEVEL_OPER, opsb_help_status}, + {"REMOVE", opsb_cmd_remove, 1, NS_ULEVEL_OPER, opsb_help_remove}, + {"CHECK", opsb_cmd_check, 1, NS_ULEVEL_OPER, opsb_help_check}, + {"ADD", opsb_cmd_add, 3, NS_ULEVEL_ADMIN, opsb_help_add}, + {"DEL", opsb_cmd_del, 1, NS_ULEVEL_ADMIN, opsb_help_del}, + {"LIST", opsb_cmd_list, 0, NS_ULEVEL_ADMIN, opsb_help_list}, + {NULL, NULL, 0, 0, NULL} }; static bot_setting opsb_settings[]= diff --git a/opsb.h b/opsb.h index 60498f3..ac4cf98 100644 --- a/opsb.h +++ b/opsb.h @@ -132,13 +132,6 @@ extern const char *opsb_help_add[]; extern const char *opsb_help_del[]; extern const char *opsb_help_list[]; -extern const char opsb_help_status_oneline[]; -extern const char opsb_help_remove_oneline[]; -extern const char opsb_help_check_oneline[]; -extern const char opsb_help_add_oneline[]; -extern const char opsb_help_del_oneline[]; -extern const char opsb_help_list_oneline[]; - extern const char *opsb_help_set_akill []; extern const char *opsb_help_set_targetip []; extern const char *opsb_help_set_targetport []; diff --git a/opsb_help.c b/opsb_help.c index 4306c91..15b2752 100644 --- a/opsb_help.c +++ b/opsb_help.c @@ -23,13 +23,6 @@ #include "neostats.h" -const char opsb_help_status_oneline[] = "View opsb status"; -const char opsb_help_remove_oneline[] = "Remove an akill set by opsb"; -const char opsb_help_check_oneline[] = "Scan a selected user"; -const char opsb_help_add_oneline[] = "Add a port to scanning"; -const char opsb_help_del_oneline[] = "Delete a port from scanning"; -const char opsb_help_list_oneline[] = "List protocols and ports scanned"; - const char *opsb_about[] = { "\2Open Proxy Scanning Bot Information\2", "", @@ -45,6 +38,7 @@ const char *opsb_about[] = { }; const char *opsb_help_check[] = { + "Scan a user, ip address or host", "Syntax: \2CHECK \2", "", "This option will scan either a user connected to your", @@ -55,12 +49,53 @@ const char *opsb_help_check[] = { }; const char *opsb_help_status[] = { + "Display opsb status", "Syntax: \2STATUS\2", "", "Display status of the open proxy scanning bot", NULL }; +const char *opsb_help_add[] = { + "Add a port to scanning", + "Syntax: \2ADD \2", + "", + "Add an entry to the port scan list.", + " must be one of:", + " HTTP, HTTPPOST, SOCKS4, SOCKS5, WINGATE, ROUTER", + " must be a valid port number.", + "The new port is scanned straight away", + NULL +}; + +const char *opsb_help_del[] = { + "Delete a port from scanning", + "Syntax: \2DEL \2", + "", + "Delete entry from the list of ports. ", + "Requires a restart of OPSB to become effective.", + NULL +}; + +const char *opsb_help_list[] = { + "List protocols and ports scanned", + "Syntax: \2LIST\2", + "", + "List the current ports and protocols scanned", + "and a ID number for use in removing entries.", + NULL +}; + +const char *opsb_help_remove[] = { + "Remove an akill set by opsb", + "Syntax: \2REMOVE \2", + "", + "Remove akills that have been set by opsb.", + " is the hostname listed in your akill list", + "(usually found with /stats a)", + NULL +}; + const char *opsb_help_set_akill [] = { "\2AKILL \2", "Whether to issue an akill for positive lookups", @@ -140,39 +175,3 @@ const char *opsb_help_set_exclusions[] = { "Use global exclusion list in addition to local exclusion list", NULL }; - -const char *opsb_help_add[] = { - "Syntax: \2ADD \2", - "", - "Add an entry to the port scan list.", - " must be one of:", - " HTTP, HTTPPOST, SOCKS4, SOCKS5, WINGATE, ROUTER", - " must be a valid port number.", - "The new port is scanned straight away", - NULL -}; - -const char *opsb_help_del[] = { - "Syntax: \2DEL \2", - "", - "Delete entry from the list of ports. ", - "Requires a restart of OPSB to become effective.", - NULL -}; - -const char *opsb_help_list[] = { - "Syntax: \2LIST\2", - "", - "List the current ports and protocols scanned", - "and a ID number for use in removing entries.", - NULL -}; - -const char *opsb_help_remove[] = { - "Syntax: \2REMOVE \2", - "", - "Remove akills that have been set by opsb.", - " is the hostname listed in your akill list", - "(usually found with /stats a)", - NULL -};