ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/hopm/branches/1.1.x/src/libopm/src/libopm.c
(Generate patch)

Comparing hopm/trunk/src/libopm/src/libopm.c (file contents):
Revision 5081 by michael, Mon Dec 22 19:16:10 2014 UTC vs.
Revision 5091 by michael, Tue Dec 23 19:59:18 2014 UTC

# Line 205 | Line 205 | void opm_remote_free(OPM_REMOTE_T *remot
205  
206     LIST_FOREACH_SAFE(p, next, remote->protocols->head)
207     {
208 <      ppc = (OPM_PROTOCOL_CONFIG_T *) p->data;
208 >      ppc = p->data;
209  
210        libopm_protocol_config_free(ppc);
211        libopm_list_remove(remote->protocols, p);
# Line 265 | Line 265 | void opm_free(OPM_T *scanner)
265  
266     LIST_FOREACH_SAFE(p, next, scanner->protocols->head)
267     {
268 <      ppc = (OPM_PROTOCOL_CONFIG_T *) p->data;
268 >      ppc = p->data;
269  
270        libopm_protocol_config_free(ppc);
271        libopm_list_remove(scanner->protocols, p);
# Line 274 | Line 274 | void opm_free(OPM_T *scanner)
274  
275     LIST_FOREACH_SAFE(p, next, scanner->scans->head)
276     {
277 <      scan = (OPM_SCAN_T *) p->data;
277 >      scan = p->data;
278        libopm_scan_free(scan);
279        libopm_list_remove(scanner->scans, p);
280        libopm_node_free(p);
# Line 282 | Line 282 | void opm_free(OPM_T *scanner)
282  
283     LIST_FOREACH_SAFE(p, next, scanner->queue->head)
284     {
285 <      scan = (OPM_SCAN_T *) p->data;
285 >      scan = p->data;
286        libopm_scan_free(scan);
287        libopm_list_remove(scanner->queue, p);
288        libopm_node_free(p);
# Line 572 | Line 572 | void opm_end(OPM_T *scanner, OPM_REMOTE_
572  
573     LIST_FOREACH_SAFE(node1, next1, scanner->queue->head)
574     {
575 <      scan = (OPM_SCAN_T *) node1->data;
575 >      scan = node1->data;
576        if(scan->remote == remote)
577        {
578           /* Free all connections */
579           LIST_FOREACH_SAFE(node2, next2, scan->connections->head)
580           {
581  
582 <            conn = (OPM_CONNECTION_T *) node2->data;
582 >            conn = node2->data;
583  
584              libopm_list_remove(scan->connections, node2);
585              libopm_connection_free(conn);
# Line 629 | Line 629 | void opm_endscan(OPM_T *scanner, OPM_REM
629     */
630     LIST_FOREACH(node1, scanner->scans->head)
631     {
632 <      scan = (OPM_SCAN_T *) node1->data;
632 >      scan = node1->data;
633  
634        if(scan->remote == remote)
635        {
# Line 742 | Line 742 | static void libopm_scan_free(OPM_SCAN_T
742  
743     LIST_FOREACH_SAFE(p, next, scan->connections->head)
744     {
745 <      conn = (OPM_CONNECTION_T *) p->data;
745 >      conn = p->data;
746        libopm_connection_free(conn);
747  
748        libopm_list_remove(scan->connections, p);
# Line 856 | Line 856 | static void libopm_check_queue(OPM_T *sc
856     {
857  
858        /* Grab the top scan */
859 <      scan = (OPM_SCAN_T *) scanner->queue->head->data;      
859 >      scan = scanner->queue->head->data;      
860        protocols = LIST_SIZE(scan->connections);
861  
862        /* Check if it will fit in the live scan list */
# Line 904 | Line 904 | static void libopm_check_establish(OPM_T
904  
905     LIST_FOREACH(node1, scanner->scans->head)
906     {
907 <      scan = (OPM_SCAN_T *) node1->data;
907 >      scan = node1->data;
908        LIST_FOREACH(node2, scan->connections->head)
909        {
910           /* Only scan if we have free file descriptors */
911           if(scanner->fd_use >= fd_limit)
912              return;
913  
914 <         conn = (OPM_CONNECTION_T *) node2->data;
914 >         conn = node2->data;
915           if(conn->state == OPM_STATE_UNESTABLISHED)
916              libopm_do_connect(scanner, scan, conn);
917        }
# Line 956 | Line 956 | static void libopm_check_closed(OPM_T *s
956  
957     LIST_FOREACH_SAFE(node1, next1, scanner->scans->head)
958     {
959 <      scan = (OPM_SCAN_T *) node1->data;
959 >      scan = node1->data;
960        LIST_FOREACH_SAFE(node2, next2, scan->connections->head)
961        {
962  
963 <         conn = (OPM_CONNECTION_T *) node2->data;
963 >         conn = node2->data;
964  
965           if(conn->state == OPM_STATE_CLOSED)
966           {
# Line 1105 | Line 1105 | static void libopm_check_poll(OPM_T *sca
1105  
1106     LIST_FOREACH(node1, scanner->scans->head)
1107     {
1108 <      scan = (OPM_SCAN_T *) node1->data;
1108 >      scan = node1->data;
1109        LIST_FOREACH(node2, scan->connections->head)
1110        {
1111           if(size >= ufds_size)
1112              break;
1113  
1114 <         conn = (OPM_CONNECTION_T *) node2->data;
1114 >         conn = node2->data;
1115        
1116           if(conn->state < OPM_STATE_ESTABLISHED ||
1117              conn->state == OPM_STATE_CLOSED)
# Line 1284 | Line 1284 | static void libopm_do_read(OPM_T *scanne
1284     list = (OPM_LIST_T *) libopm_config(scanner->config, OPM_CONFIG_TARGET_STRING);
1285     LIST_FOREACH(node, list->head)
1286     {
1287 <      target_string = (char *) node->data;
1287 >      target_string = node->data;
1288        if(strstr(conn->readbuf, target_string))
1289        {
1290           libopm_do_openproxy(scanner, scan, conn);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines