Skip to content

Commit

Permalink
Fixed compilation errors for 3.13.0 and updated Header/Information
Browse files Browse the repository at this point in the history
  • Loading branch information
Markus-Go committed Apr 15, 2015
1 parent b48d07e commit f1de8f2
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 30 deletions.
15 changes: 4 additions & 11 deletions nf-hishape-user.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,14 @@
* limitations under the License.
*
* Project: nf-HiShape
* File: nf-hishape-user.c
* File: nf-hishape-user.cc
* Purpose: userland tool for the nf-HiShape kernel module
* Responsible: Matthias Reif
* Primary Repository: https://svn.iupr.org/projects/nf-HiShape
* Web Sites: www.iupr.org, www.dfki.de
* Responsible: Markus Goldstein
* Primary Repository: https://github.com/Markus-Go/nf-hishape
* Web Sites: www.madm.dfki.de, www.goldiges.de
*/


#include <getopt.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <iostream>
#include <string>

#include "nf-hishape_util.h"

void printUsage(int argc, char *argv[]);
Expand Down
6 changes: 3 additions & 3 deletions nf-hishape.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
* Project: nf-HiShape
* File: nf-hishape.c
* Purpose: kernel module for simple but high performance traffic shaping
* Responsible: Matthias Reif
* Primary Repository: https://svn.iupr.org/projects/nf-HiShape
* Web Sites: www.iupr.org, www.dfki.de
* Responsible: Markus Goldstein
* Primary Repository: https://github.com/Markus-Go/nf-hishape
* Web Sites: www.madm.dfki.de, www.goldiges.de
*/

#include <linux/kernel.h>
Expand Down
6 changes: 3 additions & 3 deletions nf-hishape.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
* Project: nf-HiShape
* File: nf-hishape.h
* Purpose: header file for the nf-HiShape kernel module and its library/userland tool
* Responsible: Matthias Reif
* Primary Repository: https://svn.iupr.org/projects/nf-HiShape
* Web Sites: www.iupr.org, www.dfki.de
* Responsible: Markus Goldstein
* Primary Repository: https://github.com/Markus-Go/nf-hishape
* Web Sites: www.madm.dfki.de, www.goldiges.de
*/

#include <linux/ioctl.h>
Expand Down
4 changes: 2 additions & 2 deletions nf-hishape.man
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ print the help message
.br
\fRnf-hishape -f 192.168.2.1 -t 192.168.2.1 -l 100
.SH AUTHOR
Written by Matthias Reif and Emmanuel Teguetio
Written by Matthias Reif, Emmanuel Teguetio and Markus Goldstein
.SH REPORTING BUGS
Report bugs to <[email protected]>.
Report bugs to <[email protected]>.
.SH COPYRIGHT
Copyright 2007-2008 Deutsches Forschungszentrum fuer Kuenstliche Intelligenz
or its licensors, as applicable.
Expand Down
12 changes: 4 additions & 8 deletions nf-hishape_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,13 @@
* limitations under the License.
*
* Project: nf-HiShape
* File: nf-hishape_util.c
* File: nf-hishape_util.cc
* Purpose: library of the userland tool for the nf-hishape kernel module
* Responsible: Matthias Reif
* Primary Repository: https://svn.iupr.org/projects/nf-HiShape
* Web Sites: www.iupr.org, www.dfki.de
* Responsible: Markus Goldstein
* Primary Repository: https://github.com/Markus-Go/nf-hishape
* Web Sites: www.madm.dfki.de, www.goldiges.de
*/


#include <iostream>
#include <stdio.h>

#include "nf-hishape_util.h"

using namespace std;
Expand Down
12 changes: 9 additions & 3 deletions nf-hishape_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
* Project: nf-HiShape
* File: nf-hishape_util.h
* Purpose: header file containing functions for interacting with the nf-hishape kernel module
* Responsible: Matthias Reif
* Primary Repository: https://svn.iupr.org/projects/nf-HiShape
* Web Sites: www.iupr.org, www.dfki.de
* Responsible: Markus Goldstein
* Primary Repository: https://github.com/Markus-Go/nf-hishape
* Web Sites: www.madm.dfki.de, www.goldiges.de
*/

#ifndef TEST_H_
Expand All @@ -31,6 +31,12 @@
#include <arpa/inet.h>
#include <errno.h>
#include <string.h>
#include <iostream>
#include <unistd.h>
#include <stdio.h>
#include <getopt.h>
#include <stdlib.h>


#include "nf-hishape.h"

Expand Down

0 comments on commit f1de8f2

Please sign in to comment.