mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'uncool/dvbsi++' commit 'd493b1155c4'

Browse Source 
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-10-14 12:51:07 +02:00
parent aa89482ff2 d493b1155c
commit a603ec74af
442 changed files with 7648 additions and 4167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/system/configure_network.cpp
View File

@@ -24,14 +24,13 @@
#include <string.h>
#include <unistd.h>
#include "configure_network.h"
#include "libnet.h" /* netGetNameserver, netSetNameserver */
#include "network_interfaces.h" /* getInetAttributes, setInetAttributes */
#include <stdlib.h> /* system */
#include <lib/libnet/libnet.h> /* netGetNameserver, netSetNameserver */
#include <lib/libnet/network_interfaces.h> /* getInetAttributes, setInetAttributes */
#include <iostream>
#include <iomanip>
#include <sstream>
#include <fstream>
#include <system/safe_system.h>
#include <system/helpers.h>
CNetworkConfig::CNetworkConfig()
{
@@ -216,39 +215,13 @@ void CNetworkConfig::commitConfig(void)
}
}
int mysystem(char * cmd, char * arg1, char * arg2)
{
int i;
pid_t pid;
int maxfd = getdtablesize();// sysconf(_SC_OPEN_MAX);
switch (pid = vfork())
{
case -1: /* can't fork */
perror("vfork");
return -1;
case 0: /* child process */
for(i = 3; i < maxfd; i++)
close(i);
if(execlp(cmd, cmd, arg1, arg2, NULL))
{
perror("exec");
}
exit(0);
default: /* parent returns to calling process */
break;
}
waitpid(pid, 0, 0);
return 0;
}
void CNetworkConfig::startNetwork(void)
{
std::string cmd = "/sbin/ifup " + ifname;
const char _ifup[] = "/sbin/ifup";
#ifdef DEBUG
printf("CNetworkConfig::startNetwork: %s\n", cmd.c_str());
printf("CNetworkConfig::startNetwork: %s %s\n",_ifup, ifname.c_str());
#endif
safe_system(cmd.c_str());
my_system(_ifup, ifname.c_str());
if (!inet_static) {
init_vars();
@@ -258,11 +231,11 @@ void CNetworkConfig::startNetwork(void)
void CNetworkConfig::stopNetwork(void)
{
std::string cmd = "/sbin/ifdown " + ifname;
const char _ifdown[] = "/sbin/ifdown";
#ifdef DEBUG
printf("CNetworkConfig::stopNetwork: %s\n", cmd.c_str());
printf("CNetworkConfig::stopNetwork: %s %s\n",_ifdown, ifname.c_str());
#endif
safe_system(cmd.c_str());
my_system(_ifdown, ifname.c_str());
}