Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Added VERSION file. This is needed for the configure script to determ…

…ine current svn version.

Added some words about how to make documentation to README.
Updated userguide.
Smppbox now reports proper smppbox value.
Fixed warning about some defines already defined.


git-svn-id: https://svn.kannel.org/opensmppbox/trunk@22 0b225a68-5fa7-45c5-9c9e-d7f6881f360f
  • Loading branch information...
commit 5f4d10e8d87f920d4becf2c03be91481160bdd58 1 parent 9beaf68
rkluwen authored

Showing 4 changed files with 49 additions and 27 deletions. Show diff stats Hide diff stats

  1. +3 2 README
  2. +14 0 VERSION
  3. +20 23 doc/userguide.xml
  4. +12 2 gw/smppbox.c
5 README
@@ -25,11 +25,12 @@ And finally, as root:
25 25
26 26 make install
27 27
28   -You need to have a compiled version of Kannel available in order to compile
  28 +You need to have a development version of Kannel installed in order to compile
29 29 smppbox.
30 30
31 31 The Userguide has also valuable information about the install and configuration
32   -steps.
  32 +steps. To create the userguide, run ./configure with --enable-docs and then
  33 +type "make docs".
33 34
34 35 HELP
35 36 ====
14 VERSION
... ... @@ -0,0 +1,14 @@
  1 +svn
  2 +This file contains the version number of smppbox.
  3 +It is stored on the first line. Nothing else should
  4 +be there.
  5 +
  6 +Note that if you get this file from SVN, it will just
  7 +say "svn-r<revision>" instead of a version number.
  8 +This is intentional, it avoids confusion with real releases.
  9 +
  10 +Starting with version 0.8, version numbers that have an even
  11 +second part are STABLE versions and those with odd ones are
  12 +DEVELOPMENT versions. Thus, 1.0 is stable, 1.1 is development.
  13 +Don't use development versions for production unless you
  14 +really know what you do.
43 doc/userguide.xml
@@ -241,7 +241,7 @@
241 241 <para>
242 242 Latest Kannel must be installed (>1.4.3 svn version), including development
243 243 headers and libraries. Kannel's gwlib is needed for compilation.
244   - Additionally an working (running) Bearerbox is needed to route SMS to.
  244 + Additionally a working (running) Bearerbox is needed to route SMS to.
245 245 If it is not available, SMS messages can possibly be lost and no more
246 246 logins are permitted.
247 247 </para>
@@ -251,7 +251,7 @@
251 251 tool-chain is recommended)
252 252 </para>
253 253 <para>
254   - To build this documentation, docbook and a number of other tools are needed.
  254 + To build this documentation, the docbook c.s. tools are needed.
255 255 </para>
256 256 </sect1>
257 257 </chapter>
@@ -270,6 +270,7 @@
270 270 <para>
271 271 If you are upgrading from a previous version, please look at
272 272 <xref linkend="upgrading-notes"> for any important information.
  273 + See chapter 5.
273 274 </para>
274 275 </note>
275 276
@@ -305,9 +306,8 @@
305 306 </para>
306 307
307 308 <para>
308   - We intend to cover everything you need to install and use Kannel
309   - is in <citetitle>User's Guide</citetitle>, but the guide is still
310   - incomplete in this respect. The <filename>README</filename> is not
  309 + Everything you need to install and use SMPPBox is in <citetitle>User's Guide.</citetitle>
  310 + The guide is still incomplete in this respect. The <filename>README</filename> is not
311 311 supposed to be very important, nor contain much information. Instead,
312 312 it will just point to the other documentation.
313 313 </para>
@@ -318,9 +318,9 @@
318 318 <title>Compiling the proxy</title>
319 319
320 320 <para>If you are using SMPPBox on a supported platform, or one
321   - that is similar enough to one, compiling Kannel should be trivial.
322   - After you have unpacked the source package of your choose,
323   - or after you have checked out the source code from CVS, enter
  321 + that is similar enough to one, compiling Smppbox should be trivial.
  322 + After you have unpacked the source package of your choice,
  323 + or after you have checked out the source code from SVN, enter
324 324 the following commands:
325 325
326 326 <screen><userinput>
@@ -359,7 +359,7 @@
359 359
360 360 The above, for instance, seems to be required on FreeBSD. If you
361 361 want to do development, you probably want to add CFLAGS that make
362   - your compiler use warning messages. For example, for GCC:
  362 + your compiler print warning messages. For example, for GCC:
363 363
364 364 <screen><userinput>
365 365 CFLAGS='-Wall -g' ./configure
@@ -387,21 +387,21 @@
387 387
388 388 The user that runs make install needs to have write permissions
389 389 do the bindir directory. It defaults to <filename>/usr/local/sbin</filename>.
390   - So possibly you need to be root to be able to install.
391   -
  390 + So possibly you need to be root to be able to install.
392 391 The version number of the proxy is added to the file
393 392 during installation. This makes it easier to have several
394 393 versions installed, and makes it easy to go back to an older
395 394 version if the new version proves problematic.
396 395 </para>
397 396 <para>
398   - After installation, you should now be able to run the SMPPBox init.d
  397 + After installation, you should now be able to run the Kannel init.d
399 398 script that will start the proxy. Run the script as root.
400   - TODO: We don't have such a script yet.
  399 + For smppbox we don't have a seperate init script, but versions of the
  400 + Kannel init script are available that include starting smppbox.
401 401 </para>
402 402
403 403 <screen><userinput>
404   - /etc/init.d/smppbox start
  404 + /etc/init.d/kannel start
405 405 </userinput></screen>
406 406
407 407 <para>
@@ -410,7 +410,7 @@
410 410 </para>
411 411
412 412 <screen><userinput>
413   - /etc/init.d/smppbox stop
  413 + /etc/init.d/kannel stop
414 414 </userinput></screen>
415 415
416 416 <para>
@@ -420,7 +420,7 @@
420 420 </para>
421 421
422 422 <screen><userinput>
423   - /etc/init.d/smppbox restart
  423 + /etc/init.d/kannel restart
424 424 </userinput></screen>
425 425 </sect1>
426 426 </chapter>
@@ -430,8 +430,7 @@
430 430
431 431 <para>
432 432 This chapter explains how the proxy, SMPPBox, is configured and used.
433   - It covers the configuration file and keeping an eye on the gateway
434   - while it is running.
  433 + It covers the configuration file and proxy administration during runtime.
435 434 </para>
436 435 <para>
437 436 There is only one configuration file for all parts of SMPPBox. If
@@ -439,11 +438,9 @@
439 438 needs to have its own configuration file, with its own options.
440 439 </para>
441 440 <para>
442   - In the status page of bearerbox, you can see all the clients that are
443   - currently connected to smppbox. They all appear as seperate "smsbox"
444   - in the status page. Note that the ip address that is listed on the status
445   - page of bearerbox is the one of smppbox; not the client ip address of the
446   - smppbox user.
  441 + In bearerbox's status page you can see all connected smppbox clients as different smsboxes.
  442 + Note that the ip address that is listed on the status page of bearerbox is the one of smppbox;
  443 + not the client ip address of the smppbox user.
447 444 </para>
448 445
449 446 <sect1>
14 gw/smppbox.c
@@ -79,6 +79,10 @@
79 79 #include "gw/heartbeat.h"
80 80 #include "gw/meta_data.h"
81 81
  82 +#undef GW_NAME
  83 +#undef GW_VERSION
  84 +#include "../sb-config.h"
  85 +
82 86 /* our config */
83 87 static Cfg *cfg;
84 88 /* have we received restart cmd from bearerbox? */
@@ -1943,6 +1947,10 @@ static int smppbox_is_allowed_in_group(Octstr *group, Octstr *variable)
1943 1947 return 0;
1944 1948 }
1945 1949
  1950 +#undef OCTSTR
  1951 +#undef SINGLE_GROUP
  1952 +#undef MULTI_GROUP
  1953 +
1946 1954 static int smppbox_is_single_group(Octstr *query)
1947 1955 {
1948 1956 #define OCTSTR(name)
@@ -1959,7 +1967,7 @@ static int smppbox_is_single_group(Octstr *query)
1959 1967 int main(int argc, char **argv)
1960 1968 {
1961 1969 int cf_index;
1962   - Octstr *filename;
  1970 + Octstr *filename, *version;
1963 1971
1964 1972 gwlib_init();
1965 1973 all_boxes = gwlist_create();
@@ -1984,7 +1992,9 @@ int main(int argc, char **argv)
1984 1992
1985 1993 octstr_destroy(filename);
1986 1994
1987   - report_versions("smppbox");
  1995 + version = octstr_format("smppbox version %s", GW_VERSION);
  1996 + report_versions(octstr_get_cstr(version));
  1997 + octstr_destroy(version);
1988 1998
1989 1999 init_smppbox(cfg);
1990 2000

0 comments on commit 5f4d10e

Please sign in to comment.
Something went wrong with that request. Please try again.