- Timestamp:
- 05/23/06 17:13:39 (16 years ago)
- Branches:
- 4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
- Children:
- 64444f9
- Parents:
- d8d1ff7
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/format_erf.c
r5b4404a r0e9b9f8 115 115 unsigned curr; 116 116 unsigned offset; 117 unsigned int dagstream; 117 118 } dag; 118 119 #endif … … 165 166 return -1; 166 167 } 168 169 DAG.dagstream = 0; 170 167 171 if (S_ISCHR(buf.st_mode)) { 168 172 /* DEVICE */ … … 452 456 #ifdef HAVE_DAG 453 457 static int dag_pause_input(libtrace_t *libtrace) { 458 #if DAG_VERSION_2_4 454 459 dag_stop(INPUT.fd); 460 #else 461 if (dag_stop_stream(INPUT.fd, DAG.dagstream) < 0) { 462 trace_set_err(libtrace, errno, "Could not stop DAG stream"); 463 return -1; 464 } 465 if (dag_detach_stream(INPUT.fd, DAG.dagstream) < 0) { 466 trace_set_err(libtrace, errno, "Could not detach DAG stream"); 467 return -1; 468 } 469 #endif 455 470 return 0; /* success */ 456 471 } … … 458 473 static int dag_fin_input(libtrace_t *libtrace) { 459 474 /* dag pause input implicitly called to cleanup before this */ 475 460 476 dag_close(INPUT.fd); 461 477 if (DUCK.dummy_duck) … … 642 658 643 659 static int dag_start_input(libtrace_t *libtrace) { 660 #if DAG_VERSION_2_4 644 661 if(dag_start(INPUT.fd) < 0) { 645 662 trace_set_err(libtrace,errno,"Cannot start DAG %s", … … 647 664 return -1; 648 665 } 666 #else 667 if (dag_attach_stream(INPUT.fd, DAG.dagstream, 0, 0) < 0) { 668 trace_set_err(libtrace, errno, "Cannot attach DAG stream"); 669 return -1; 670 } 671 if (dag_start_stream(INPUT.fd, DAG.dagstream) < 0) { 672 trace_set_err(libtrace, errno, "Cannot start DAG stream"); 673 return -1; 674 } 675 #endif 649 676 /* dags appear to have a bug where if you call dag_start after 650 677 * calling dag_stop, and at least one packet has arrived, bad things
Note: See TracChangeset
for help on using the changeset viewer.