Diffstat (limited to 'noncore/settings/networksettings') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/ppp/modem.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/noncore/settings/networksettings/ppp/modem.cpp b/noncore/settings/networksettings/ppp/modem.cpp index 002c8e7..2da9b14 100644 --- a/noncore/settings/networksettings/ppp/modem.cpp +++ b/noncore/settings/networksettings/ppp/modem.cpp | |||
@@ -1,128 +1,130 @@ | |||
1 | /* | 1 | /* |
2 | * kPPP: A pppd Front End for the KDE project | 2 | * kPPP: A pppd Front End for the KDE project |
3 | * | 3 | * |
4 | * $Id$ | 4 | * $Id$ |
5 | * | 5 | * |
6 | * Copyright (C) 1997 Bernd Johannes Wuebben | 6 | * Copyright (C) 1997 Bernd Johannes Wuebben |
7 | * wuebben@math.cornell.edu | 7 | * wuebben@math.cornell.edu |
8 | * | 8 | * |
9 | * This file was added by Harri Porten <porten@tu-harburg.de> | 9 | * This file was added by Harri Porten <porten@tu-harburg.de> |
10 | * | 10 | * |
11 | * | 11 | * |
12 | * This program is free software; you can redistribute it and/or | 12 | * This program is free software; you can redistribute it and/or |
13 | * modify it under the terms of the GNU Library General Public | 13 | * modify it under the terms of the GNU Library General Public |
14 | * License as published by the Free Software Foundation; either | 14 | * License as published by the Free Software Foundation; either |
15 | * version 2 of the License, or (at your option) any later version. | 15 | * version 2 of the License, or (at your option) any later version. |
16 | * | 16 | * |
17 | * This program is distributed in the hope that it will be useful, | 17 | * This program is distributed in the hope that it will be useful, |
18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
20 | * Library General Public License for more details. | 20 | * Library General Public License for more details. |
21 | * | 21 | * |
22 | * You should have received a copy of the GNU Library General Public | 22 | * You should have received a copy of the GNU Library General Public |
23 | * License along with this program; if not, write to the Free | 23 | * License along with this program; if not, write to the Free |
24 | * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 24 | * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include <errno.h> | 27 | #include <errno.h> |
28 | #include <stdlib.h> | 28 | #include <stdlib.h> |
29 | #include <unistd.h> | 29 | #include <unistd.h> |
30 | #include <fcntl.h> | 30 | #include <fcntl.h> |
31 | #include <signal.h> | 31 | #include <signal.h> |
32 | #include <sys/ioctl.h> | 32 | #include <sys/ioctl.h> |
33 | #include <sys/types.h> | ||
34 | #include <sys/stat.h> | ||
33 | #include <setjmp.h> | 35 | #include <setjmp.h> |
34 | #include <regex.h> | 36 | #include <regex.h> |
35 | #include <qregexp.h> | 37 | #include <qregexp.h> |
36 | #include <assert.h> | 38 | #include <assert.h> |
37 | #include <string.h> | 39 | #include <string.h> |
38 | 40 | ||
39 | #ifdef HAVE_RESOLV_H | 41 | #ifdef HAVE_RESOLV_H |
40 | # include <arpa/nameser.h> | 42 | # include <arpa/nameser.h> |
41 | # include <resolv.h> | 43 | # include <resolv.h> |
42 | #endif | 44 | #endif |
43 | 45 | ||
44 | #ifndef _PATH_RESCONF | 46 | #ifndef _PATH_RESCONF |
45 | #define _PATH_RESCONF "/etc/resolv.conf" | 47 | #define _PATH_RESCONF "/etc/resolv.conf" |
46 | #endif | 48 | #endif |
47 | 49 | ||
48 | #define strlcpy strcpy | 50 | #define strlcpy strcpy |
49 | #include "auth.h" | 51 | #include "auth.h" |
50 | #include "modem.h" | 52 | #include "modem.h" |
51 | #include "pppdata.h" | 53 | #include "pppdata.h" |
52 | //#include <klocale.h> | 54 | //#include <klocale.h> |
53 | #define i18n QObject::tr | 55 | #define i18n QObject::tr |
54 | #define qError qDebug | 56 | #define qError qDebug |
55 | //#include <kdebug.h> | 57 | //#include <kdebug.h> |
56 | //#include <config.h> | 58 | //#include <config.h> |
57 | 59 | ||
58 | #define MY_ASSERT(x) if (!(x)) { \ | 60 | #define MY_ASSERT(x) if (!(x)) { \ |
59 | qFatal( "ASSERT: \"%s\" in %s (%d)\n",#x,__FILE__,__LINE__); \ | 61 | qFatal( "ASSERT: \"%s\" in %s (%d)\n",#x,__FILE__,__LINE__); \ |
60 | exit(1); } | 62 | exit(1); } |
61 | 63 | ||
62 | 64 | ||
63 | static sigjmp_buf jmp_buffer; | 65 | static sigjmp_buf jmp_buffer; |
64 | 66 | ||
65 | //Modem *Modem::modem = 0; | 67 | //Modem *Modem::modem = 0; |
66 | 68 | ||
67 | 69 | ||
68 | const char* pppdPath() { | 70 | const char* pppdPath() { |
69 | // wasting a few bytes | 71 | // wasting a few bytes |
70 | static char buffer[sizeof(PPPDSEARCHPATH)+sizeof(PPPDNAME)]; | 72 | static char buffer[sizeof(PPPDSEARCHPATH)+sizeof(PPPDNAME)]; |
71 | static char *pppdPath = 0L; | 73 | static char *pppdPath = 0L; |
72 | char *p; | 74 | char *p; |
73 | 75 | ||
74 | if(pppdPath == 0L) { | 76 | if(pppdPath == 0L) { |
75 | const char *c = PPPDSEARCHPATH; | 77 | const char *c = PPPDSEARCHPATH; |
76 | while(*c != '\0') { | 78 | while(*c != '\0') { |
77 | while(*c == ':') | 79 | while(*c == ':') |
78 | c++; | 80 | c++; |
79 | p = buffer; | 81 | p = buffer; |
80 | while(*c != '\0' && *c != ':') | 82 | while(*c != '\0' && *c != ':') |
81 | *p++ = *c++; | 83 | *p++ = *c++; |
82 | *p = '\0'; | 84 | *p = '\0'; |
83 | strcat(p, "/"); | 85 | strcat(p, "/"); |
84 | strcat(p, PPPDNAME); | 86 | strcat(p, PPPDNAME); |
85 | if(access(buffer, F_OK) == 0) | 87 | if(access(buffer, F_OK) == 0) |
86 | return (pppdPath = buffer); | 88 | return (pppdPath = buffer); |
87 | } | 89 | } |
88 | } | 90 | } |
89 | 91 | ||
90 | return pppdPath; | 92 | return pppdPath; |
91 | } | 93 | } |
92 | 94 | ||
93 | 95 | ||
94 | Modem::Modem( PPPData* pd ) | 96 | Modem::Modem( PPPData* pd ) |
95 | { | 97 | { |
96 | _pppdata = pd; | 98 | _pppdata = pd; |
97 | modemfd = -1; | 99 | modemfd = -1; |
98 | _pppdExitStatus = -1; | 100 | _pppdExitStatus = -1; |
99 | pppdPid = -1; | 101 | pppdPid = -1; |
100 | sn = 0L; | 102 | sn = 0L; |
101 | data_mode = false; | 103 | data_mode = false; |
102 | modem_is_locked = false; | 104 | modem_is_locked = false; |
103 | lockfile[0] = '\0'; | 105 | lockfile[0] = '\0'; |
104 | device = "/dev/modem"; | 106 | device = "/dev/modem"; |
105 | } | 107 | } |
106 | 108 | ||
107 | 109 | ||
108 | Modem::~Modem() | 110 | Modem::~Modem() |
109 | { | 111 | { |
110 | } | 112 | } |
111 | 113 | ||
112 | 114 | ||
113 | speed_t Modem::modemspeed() { | 115 | speed_t Modem::modemspeed() { |
114 | // convert the string modem speed int the gpppdata object to a t_speed type | 116 | // convert the string modem speed int the gpppdata object to a t_speed type |
115 | // to set the modem. The constants here should all be ifdef'd because | 117 | // to set the modem. The constants here should all be ifdef'd because |
116 | // other systems may not have them | 118 | // other systems may not have them |
117 | int i = _pppdata->speed().toInt()/100; | 119 | int i = _pppdata->speed().toInt()/100; |
118 | 120 | ||
119 | switch(i) { | 121 | switch(i) { |
120 | case 24: | 122 | case 24: |
121 | return B2400; | 123 | return B2400; |
122 | break; | 124 | break; |
123 | case 96: | 125 | case 96: |
124 | return B9600; | 126 | return B9600; |
125 | break; | 127 | break; |
126 | case 192: | 128 | case 192: |
127 | return B19200; | 129 | return B19200; |
128 | break; | 130 | break; |