p
/
ponymap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of some memory holes on x86_64

This commit is contained in:
Přemysl Eric Janouch 2014-09-24 20:26:46 +02:00
parent 21cab71e75
commit 49e7f1798e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ponymap.c
View File

@ -214,8 +214,6 @@ struct unit
size_t ref_count; ///< Reference count size_t ref_count; ///< Reference count
struct target *target; ///< Target context struct target *target; ///< Target context
uint16_t port; ///< The scanned port
struct service *service; ///< Service struct service *service; ///< Service
void *service_data; ///< User data for service void *service_data; ///< User data for service
@ -223,17 +221,18 @@ struct unit
void *transport_data; ///< User data for transport void *transport_data; ///< User data for transport
int socket_fd; ///< The TCP socket int socket_fd; ///< The TCP socket
uint16_t port; ///< The scanned port
struct str read_buffer; ///< Unprocessed input struct str read_buffer; ///< Unprocessed input
struct str write_buffer; ///< Output yet to be sent out struct str write_buffer; ///< Output yet to be sent out
struct poller_timer timeout_event; ///< Timeout event struct poller_timer timeout_event; ///< Timeout event
struct poller_fd fd_event; ///< FD event struct poller_fd fd_event; ///< FD event
struct str_vector info; ///< Info resulting from the scan
bool scan_started; ///< Whether the scan has been started bool scan_started; ///< Whether the scan has been started
bool abortion_requested; ///< Abortion requested by service bool abortion_requested; ///< Abortion requested by service
bool aborted; ///< Scan has been aborted bool aborted; ///< Scan has been aborted
bool success; ///< Service has been found bool success; ///< Service has been found
struct str_vector info; ///< Info resulting from the scan
}; };
static struct unit *unit_ref (struct unit *self); static struct unit *unit_ref (struct unit *self);
@ -278,12 +277,12 @@ struct indicator
{ {
struct poller_timer timer; ///< The animation timer struct poller_timer timer; ///< The animation timer
unsigned position; ///< The current animation character
const char *frames; ///< All the characters const char *frames; ///< All the characters
size_t frames_len; ///< The number of characters size_t frames_len; ///< The number of characters
bool shown; ///< The indicator is shown on screen
char *status; ///< The status text char *status; ///< The status text
unsigned position; ///< The current animation character
bool shown; ///< The indicator is shown on screen
}; };
static void indicator_init (struct indicator *self, struct poller *poller); static void indicator_init (struct indicator *self, struct poller *poller);
@ -298,11 +297,11 @@ indicator_free (struct indicator *self)
struct generator struct generator
{ {
struct ip_range *ip_range_iter; ///< Current IP range
uint32_t ip_iter; ///< IP iterator within the range
struct target *current_target; ///< Current target struct target *current_target; ///< Current target
struct ip_range *ip_range_iter; ///< Current IP range
struct port_range *port_range_iter; ///< Current port range struct port_range *port_range_iter; ///< Current port range
uint32_t ip_iter; ///< IP iterator within the range
uint16_t port_iter; ///< Port iterator within the range uint16_t port_iter; ///< Port iterator within the range
struct str_map_iter svc_iter; ///< Service iterator struct str_map_iter svc_iter; ///< Service iterator

1
utils.c
View File

@ -883,6 +883,7 @@ struct poller_idle
{ {
LIST_HEADER (poller_idle) LIST_HEADER (poller_idle)
struct poller *poller; ///< Our poller struct poller *poller; ///< Our poller
bool active; ///< Whether we're on the list bool active; ///< Whether we're on the list
poller_idle_fn dispatcher; ///< Event dispatcher poller_idle_fn dispatcher; ///< Event dispatcher