*para_server*
-para_server streams binary audio data (MP3, OGG/Vorbis, M4A, WMA
-files) over local and/or remote networks. It listens on a TCP port and
-accepts commands such as play, stop, pause, next from authenticated
-clients. There are many more commands though, see the man page of
-para_server for a description of all commands.
+para_server streams binary audio data (MP3, ...) over local and/or
+remote networks. It listens on a TCP port and accepts commands such
+as play, stop, pause, next from authenticated clients. There are
+many more commands though, see the man page of para_server for a
+description of all commands.
It supports three built-in network streaming protocols
(senders/receivers): HTTP, DCCP, or UDP. This is explained in more
with a symmetric RC4 session key. For each user of paraslash you must
create a public/secret RSA key pair for authentication.
+If para_client is started without non-option arguments, an interactive
+session (shell) is started. Command history and command completion are
+supported through libreadline.
*para_audiod*
The client program which talks to para_audiod. Used to control
para_audiod, to receive status info, or to grab the stream at any
-point of the decoding process.
+point of the decoding process. Like para_client, para_audioc supports
+interactive sessions on systems with libreadline.
*para_recv*
A command line HTTP/DCCP/UDP stream grabber. The http mode is
compatible with arbitrary HTTP streaming sources (e.g. icecast).
+In addition to the three network streaming modes, para_recv can also
+operate in local (afh) mode. In this mode it writes the content of
+an audio file on the local file system in complete chunks to stdout,
+optionally 'just in time'. This allows to cut an audio file without
+first decoding it, and it enables third-party software which is unaware
+of the particular audio format to send complete frames in real time.
*para_filter*
A filter program that reads from STDIN and writes to STDOUT.
-Like para_recv, this is an atomic building block which can be used
-to assemble higher-level audio receiving facilities. It combines
-several different functionalities in one tool: decoders for multiple
-audio formats (MP3, OGG/Vorbis, AAC, WMA) and a number of processing
-filters, among these a normalizer for audio volume.
+Like para_recv, this is an atomic building block which can be used to
+assemble higher-level audio receiving facilities. It combines several
+different functionalities in one tool: decoders for multiple audio
+formats and a number of processing filters, among these a normalizer
+for audio volume.
*para_afh*
A small stand-alone program that prints tech info about the given
audio file to STDOUT. It can be instructed to print a "chunk table",
-an array of offsets within the audio file or to write the content of
-the audio file in complete chunks 'just in time'.
-
-This allows third-party streaming software that is unaware of the
-particular audio format to send complete frames in real time.
+an array of offsets within the audio file.
*para_write*
coreaudio (Mac OS). para_write can also be used as a stand-alone WAV
or raw audio player.
+*para_play*
+
+A command line audio player.
*para_gui*
*para_fade*
-An (OSS-only) alarm clock and volume-fader.
+An alarm clock and volume-fader for OSS and ALSA.
-----------
Quick start
Requirements
~~~~~~~~~~~~
+For the impatient:
+
+ git clone git://git.tuebingen.mpg.de/osl
+ cd osl && make && sudo make install && sudo ldconfig
+ sudo apt-get install autoconf libssl-dev help2man gengetopt \
+ libmad0-dev libid3tag0-dev libasound2-dev libvorbis-dev \
+ libfaad-dev libspeex-dev libFLAC-dev libsamplerate-dev \
+ libasound2-dev libao-dev libreadline-dev libncurses-dev
-In any case you'll need
+Detailed description: In any case you'll need
- XREFERENCE(http://systemlinux.org/~maan/osl/, libosl).
The _object storage layer_ library is used by para_server. To
git clone git://git.tuebingen.mpg.de/osl
- - XREFERENCE(ftp://ftp.gnu.org/pub/gnu/gcc, gcc). The
- EMPH(gnu compiler collection) is usually shipped with the
- distro. gcc-3.3 or newer is required.
+ - XREFERENCE(ftp://ftp.gnu.org/pub/gnu/gcc, gcc) or
+ XREFERENCE(http://clang.llvm.org, clang). All gcc versions
+ >= 3.3 are currently supported. Clang version 1.1 or newer
+ should work as well.
- XREFERENCE(ftp://ftp.gnu.org/pub/gnu/make, gnu make) is
also shipped with the disto. On BSD systems the gnu make
scripts which run during compilation require the EMPH(Bourne
again shell). It is most likely already installed.
- - XREFERENCE(http://www.openssl.org/, openssl). The EMPH(Secure
- Sockets Layer) library is needed for cryptographic routines
- on both the server and the client side. It is usually shipped
- with the distro, but you might have to install the "development
- package" (called libssl-dev on debian systems) as well.
+ - XREFERENCE(ftp://ftp.gnu.org/pub/gnu/gengetopt/, gengetopt)
+ is needed to generate the C code for the command line parsers
+ of all paraslash executables.
- XREFERENCE(ftp://ftp.gnu.org/pub/gnu/help2man, help2man)
is used to create the man pages.
Optional:
+ - XREFERENCE(http://www.openssl.org/, openssl) or
+ XREFERENCE(ftp://ftp.gnupg.org/gcrypt/libgcrypt/, libgcrypt).
+ At least one of these two libraries is needed as the backend
+ for cryptographic routines on both the server and the client
+ side. Both openssl and libgcrypt are usually shipped with the
+ distro, but you might have to install the development package
+ (libssl-dev or libgcrypt-dev on debian systems) as well.
+
- XREFERENCE(http://www.underbit.com/products/mad/, libmad).
To compile in MP3 support for paraslash, the development
package must be installed. It is called libmad0-dev on
- XREFERENCE(http://www.audiocoding.com/, libfaad). For aac
files (m4a) you'll need libfaad (libfaad-dev).
+ - XREFERENCE(http://www.speex.org/, speex). In order to stream
+ or decode speex files, libspeex (libspeex-dev) is required.
+
+ - XREFERENCE(http://flac.sourceforge.net/, flac). To stream
+ or decode files encoded with the _Free Lossless Audio Codec_,
+ libFLAC (libFLAC-dev) must be installed.
+
+ - XREFERENCE(http://www.mega-nerd.com/SRC/index.html,
+ libsamplerate). The resample filter will only be compiled if
+ this library is installed. Debian package: libsamplerate-dev.
+
- XREFERENCE(ftp://ftp.alsa-project.org/pub/lib/, alsa-lib). On
Linux, you'll need to have ALSA's development package
libasound2-dev installed.
+ - XREFERENCE(http://downloads.xiph.org/releases/ao/,
+ libao). Needed to build the ao writer (ESD, PulseAudio,...).
+ Debian package: libao-dev.
+
+ - XREFERENCE(ftp://ftp.gnu.org/pub/gnu/ncurses, curses). Needed
+ for para_gui. Debian package: libncurses-dev.
+
+ - XREFERENCE(http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html,
+ GNU Readline). If this library (libreadline-dev) is installed,
+ para_client, para_audioc and para_play support interactive
+ sessions.
+
Installation
~~~~~~~~~~~~
REFERENCE(Requirements, required software) are installed on your
system.
-You don't need everything listed there. In particular, MP3, OGG/Vorbis
-and AAC support are all optional. The configure script will detect
-what is installed on your system and will only try to build those
-executables that can be built with your setup.
+You don't need everything listed there. In particular, MP3, OGG/Vorbis,
+OGG/Speex and AAC support are all optional. The configure script will
+detect what is installed on your system and will only try to build
+those executables that can be built with your setup.
Note that no special decoder library (not even the MP3 decoding library
libmad) is needed for para_server if you only want to stream MP3 or WMA
files. Also, it's fine to use para_server on a box without sound card.
Next, install the paraslash package on all machines, you'd like this
-software to run on:
+software to run on. If you compile from a released tarball, execute
(./configure && make) > /dev/null
+When compiling from git or from snapshots downloaded via gitweb,
+the above command will not work because the configure script is not
+included in the git repository. In this case the following command
+should be used instead:
+
+ ./autogen.sh
+
+This runs autoconf to generate the configure script, then runs it as
+above. Therefore you'll need autoconf for this to work.
+
There should be no errors but probably some warnings about missing
packages which usually implies that not all audio formats will be
supported. If headers or libs are installed at unusual locations you
./configure --help
to see a list of options. If the paraslash package was compiled
-successfully, execute as root,
+successfully, execute (optionally)
+
+ make test
+
+to run the paraslash test suite. If all tests pass, execute as root
make install
user=bar
target=~/.paraslash/server.users
- key=~/.paraslash/key.pub.$user
+ key=~/.paraslash/id_rsa.pub.$user
perms=AFS_READ,AFS_WRITE,VSS_READ,VSS_WRITE
mkdir -p ~/.paraslash
echo "user $user $key $perms" >> $target
Next, change to the "bar" account on client_host and generate the
key pair with the commands
- key=~/.paraslash/key.$LOGNAME
- mkdir -p ~/.paraslash
- (umask 077 && openssl genrsa -out $key 2048)
+ ssh-keygen -t rsa -b 2048
+ # hit enter twice to create a key with no passphrase
-para_server only needs to know the public key of the key pair just
-created. It can be extracted with
+This generates the two files id_rsa and id_rsa.pub in ~/.ssh. Note
+that paraslash can also read keys generated by the "openssl genrsa"
+command. However, since keys created with ssh-keygen can also be used
+for ssh, this method is recommended.
- pubkey=~/.paraslash/key.pub.$LOGNAME
- openssl rsa -in $key -pubout -out $pubkey
+Note that para_server refuses to use a key if it is shorter than 2048
+bits. In particular, the RSA keys of paraslash 0.3.x will not work
+with version 0.4.x. Moreover, para_client refuses to use a (private)
+key which is world-readable.
-Copy the public key just created to server_host (you may skip this step
-for a single-user setup, i.e. if foo=bar and server_host=client_host):
+para_server only needs to know the public key of the key pair just
+created. Copy this public key to server_host:
- scp $pubkey foo@server_host:.paraslash/
+ src=~/.ssh/id_rsa.pub
+ dest=.paraslash/id_rsa.pub.$LOGNAME
+ scp $src foo@server_host:$dest
Finally, tell para_client to connect to server_host:
sudo chown $LOGNAME /var/paraslash
-Alternatively, use the --afs_socket Option to specify a different
+Alternatively, use the --afs-socket Option to specify a different
location for the AFS command socket.
For this first try, we'll use the info loglevel to make the output
We will also have to tell para_audiod that it should receive the
-audio stream from server_host:
+audio stream from server_host via http:
- para_audiod -l info -r 'mp3:http -i server_host'
+ para_audiod -l info -r '.:http -i server_host'
You should now be able to listen to the audio stream once para_server
starts streaming. To activate streaming, execute
called the public key and the private key. A message can be encrypted
with either key and only the counterpart of that key can decrypt
the message. While RSA can be used for both signing and encrypting
-a message, paraslash only uses RSA only for the latter purpose. The
+a message, paraslash uses RSA only for the latter purpose. The
RSA public key encryption and signatures algorithms are defined in
detail in RFC 2437.
- para_client connects to para_server and sends an
authentication request for a user. It does so by connecting
- to para_server, TCP 2990, the control port of para_server.
+ to TCP port 2990 of the server host. This port is called the
+ para_server _control port_.
- para_server accepts the connection and forks a child process
- which is supposed to handle the connection. The parent process
- keeps listening on the control port while the child process
- (also called para_server below) continues as follows.
+ which handles the incoming request. The parent process keeps
+ listening on the control port while the child process (also
+ called para_server below) continues as follows.
- para_server loads the RSA public key of that user, fills a
fixed-length buffer with random bytes, encrypts that buffer
session key.
- para_client receives the encrypted buffer and decrypts it
- using the user's private key, thereby obtaining the challenge
+ with the user's private key, thereby obtaining the challenge
buffer and the session key. It sends the SHA1 hash value of
the challenge back to para_server and stores the session key
for further use.
this point on the communication is encrypted using the RC4
stream cipher with the session key known to both peers.
-paraslash relies on the quality of openssl's cryptographically strong
-pseudo-random bytes, on the security of the implementation of the
-openssl RSA and RC4 crypto routines and on the infeasibility to invert
-the SHA1 function.
+paraslash relies on the quality of the pseudo-random bytes provided
+by the crypto library (openssl or libgcrypt), on the security of
+the implementation of the RSA and RC4 crypto routines and on the
+infeasibility to invert the SHA1 function.
Neither para_server or para_client create RSA keys on their own. This
has to be done once for each user as sketched in REFERENCE(Quick start,
The user_list file
~~~~~~~~~~~~~~~~~~
-At startup para_server reads the user list file which must contain
-one line per user. The default location of the user list file may be
-changed with the --user_list option.
+At startup para_server reads the user list file which contains one
+line per user. The default location of the user list file may be
+changed with the --user-list option.
There should be at least one user in this file. Each user must have
an RSA key pair. The public part of the key is needed by para_server
contains in the third column the permissions needed to execute the
command.
-A new RSA key can be created with
-
- openssl genrsa -out <private_key> 2048
-
-and the public part may be extracted with
-
- openssl rsa -in <private_key> -pubout -out <public_key>
-
-Note that para_server refuses to use a key if it is shorter than 2048
-bits. In particular, the RSA keys of paraslash 0.3.x will not work
-with version 0.4.x. Moreover, para_client refuses to use a (private)
-key which is world-readable.
-
It is possible to make para_server reread the user_list file by
executing the paraslash "hup" command or by sending SIGHUP to the
PID of para_server.
allow para_audiod to obtain the Unix credentials of the connecting
process.
-Use para_audiod's --user_allow option to allow connections only for
+Use para_audiod's --user-allow option to allow connections only for
a limited set of users.
-----------------------
maintains tables containing images (e.g. album cover art) and lyrics
that can be associated with one or more audio files.
-AFS uses libosl, the object storage layer, as the backend library
-for storing information on audio files, playlists, etc. This library
-offers functionality similar to a relational database, but is much
-more lightweight than a full database backend.
+AFS uses XREFERENCE(http://systemlinux.org/~maan/osl/, libosl), the
+object storage layer library, as the backend library for storing
+information on audio files, playlists, etc. This library offers
+functionality similar to a relational database, but is much more
+lightweight than a full database backend.
In this chapter we sketch the setup of the REFERENCE(The AFS process,
AFS process) during server startup and proceed with the description
in detail and contains pratical examples. The way REFERENCE(File
renames and content changes, file renames and content changes) are
detected is discussed briefly before the REFERENCE(Troubleshooting,
-Troubleshooting) section which concludes the chapter.
+Troubleshooting) section concludes the chapter.
The AFS process
~~~~~~~~~~~~~~~
- The lyrics id which describes the lyrics associated with
this audio file.
- - The audio format id (MP3, OGG, AAC, WMA).
+ - The audio format id (MP3, OGG, ...).
- An amplification value that can be used by the amplification
filter to pre-amplify the decoded audio stream.
para_client setatt test- /path/to/the/audio/file
Instead of a path you may use a shell wildcard pattern. The attribute
-is applied to all audio files matching that pattern:
+is applied to all audio files matching this pattern:
para_client setatt test+ '/test/directory/*'
Note that the images and lyrics are not interpreted at all, and also
the playlist and the mood blobs are only investigated when the mood
-or playlist is activated by using the select command.
+or playlist is activated with the select command.
*The score table*
last_played and the num_played fields in the audio file table.
The score table is recomputed by the select command which loads a
-new mood or playlist.
+mood or playlist. Audio files are chosen for streaming from the rows
+of the score table on a highest-score-first basis.
+
Playlists and moods
~~~~~~~~~~~~~~~~~~~
audio file table. As an example, a mood can define a filename pattern,
which is then matched against the names of audio files in the table.
-Selecting a mood or playlist means the generation of a ranking
-(a score table) for the set of admissible files. Audio files are
-then selected on a highest-score-first basis. The score table is
-recomputed at the moment the mood or playlist is selected.
-
*Playlists*
Playlists are accommodated in the playlist table of the afs database,
-using the aforementioned blob format for tables. A new filelist is
-created using the addpl command, by specifying the full (absolute)
-paths of all desired audio files, separated by newlines. For example
+using the aforementioned blob format for tables. A new playlist is
+created with the addpl command by specifying the full (absolute)
+paths of all desired audio files, separated by newlines. Example:
find /my/mp3/dir -name "*.mp3" | para addpl my_playlist
a set of *mood lines* containing expressions in terms of attributes
and other data contained in the database.
-At any time, at most one mood can be *active* which means that
+At any time at most one mood can be *active* which means that
para_server is going to select only files from that subset of
admissible files.
has no year tag or the content of the year tag is not a number. Such
audio files never match. Another difference is the special treatment
if the year tag is a two-digit number. In this case either 1900 or
-2000 are added to the tag value depending on whether the number is
+2000 is added to the tag value, depending on whether the number is
greater than 2000 plus the current year.
Vorbis codec creates variable-bitrate (VBR) data, where the bitrate
may vary considerably.
+*OGG/Speex*
+
+Speex is an open-source speech codec that is based on CELP (Code
+Excited Linear Prediction) coding. It is designed for voice
+over IP applications, has modest complexity and a small memory
+footprint. Wideband and narrowband (telephone quality) speech are
+supported. As for Vorbis audio, Speex bit-streams are often stored
+in OGG files.
+
*AAC*
Advanced Audio Coding (AAC) is a standardized, lossy compression
is composed of superframes, each containing one or more frames of
2048 samples. For 16 bit stereo a WMA superframe is about 8K large.
+*FLAC*
+
+The Free Lossless Audio Codec (FLAC) compresses audio without quality
+loss. It gives better compression ratios than a general purpose
+compressor like zip or bzip2 because FLAC is designed specifically
+for audio. A FLAC-encoded file consits of frames of varying size, up
+to 16K. Each frame starts with a header that contains all information
+necessary to decode the frame.
+
Meta data
~~~~~~~~~
32 characters long. ID3, version 2 is much more flexible but requires
a separate library being installed for paraslash to support it.
-Ogg vorbis files contain meta data as Vorbis comments, which are
-typically implemented as strings of the form "[TAG]=[VALUE]". Unlike
-ID3 version 1 tags, one may use whichever tags are appropriate for
-the content.
+Ogg vorbis, ogg speex and flac files contain meta data as Vorbis
+comments, which are typically implemented as strings of the form
+"[TAG]=[VALUE]". Unlike ID3 version 1 tags, one may use whichever
+tags are appropriate for the content.
AAC files usually use the MPEG-4 container format for storing meta
data while WMA files wrap meta data as special objects within the
Chunks and chunk tables
~~~~~~~~~~~~~~~~~~~~~~~
-paraslash uses the word "chunk" as common term for the building
-blocks of an audio file. For MP3 files, a chunk is the same as an
-MP3 frame, while for OGG/Vorbis files, a chunk is an OGG page, etc.
-Therefore the chunk size varies considerably between audio formats,
-from a few hundred bytes (MP3) up to 8K (WMA).
+paraslash uses the word "chunk" as common term for the building blocks
+of an audio file. For MP3 files, a chunk is the same as an MP3 frame,
+while for OGG files a chunk is an OGG page, etc. Therefore the chunk
+size varies considerably between audio formats, from a few hundred
+bytes (MP3) up to 16K (FLAC).
The chunk table contains the offsets within the audio file that
correspond to the chunk boundaries of the file. Like the meta data,
Streams with headers and headerless streams
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-For ogg vorbis and wma streams, not all information needed to decode
-the stream is contained in each data chunk but only in the audio
-file header of the container format. Therefore clients must be able
-to obtain this information in case streaming starts in the middle of
-the file or if para_audiod is started while para_server is already
-sending a stream.
+For OGG/Vorbis, OGG/Speex and wma streams, some of the information
+needed to decode the stream is only contained in the audio file
+header of the container format but not in each data chunk. Clients
+must be able to obtain this information in case streaming starts in
+the middle of the file or if para_audiod is started while para_server
+is already sending a stream.
This is accomplished in different ways, depending on the streaming
protocol. For connection-oriented streams (HTTP, DCCP) the audio file
-> Create a minimal config for para_audiod for HTTP streams:
c=$HOME/.paraslash/audiod.conf.min; s=server.foo.com
- formats="mp3 ogg aac wma" # remove what you do not have
- for f in $formats; do echo receiver \"$f:http -i $s\"; done > $c
+ echo receiver \".:http -i $s\" > $c
para_audiod --config $c
-------
connected to a receiver which produces the input stream and a writer
which absorbs the output stream.
-Some filters depend on a specific library being installed and are
-not compiled in if this library was not found at compile time. To
-see the list of supported filters, run para_filter and para_audiod
-with the --help option. The output looks similar to the following:
+Some filters depend on a specific library and are not compiled in
+if this library was not found at compile time. To see the list of
+supported filters, run para_filter and para_audiod with the --help
+option. The output looks similar to the following:
Available filters:
compress wav amp fecdec wmadec prebuffer oggdec aacdec mp3dec
para_filter -f 'mp3dec --ignore-crc' -f 'compress --damp 1'
For para_audiod, each audio format has its own set of filters. The
-name of the audio format for which the filter should be applied is
-used as the prefix for the filter option. Example:
+name of the audio format for which the filter should be applied can
+be used as the prefix for the filter option. Example:
para_audiod -f 'mp3:prebuffer --duration 300'
+The "mp3" prefix above is actually interpreted as a POSIX extended
+regular expression. Therefore
+
+ para_audiod -f '.:prebuffer --duration 300'
+
+activates the prebuffer filter for all supported audio formats (because
+"." matches all audio formats) while
+
+ para_audiod -f 'wma|ogg:prebuffer --duration 300'
+
+activates it only for wma and ogg streams.
+
Decoders
~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~
As already mentioned REFERENCE(Streaming protocols, earlier),
-paraslash uses forward error correction (FEC) for the unreliable
-UDP transport. FEC is a technique which was invented already in
-1960 by Reed and Solomon and which is widely used for the parity
+paraslash uses forward error correction (FEC) for the unreliable UDP
+and DCCP transports. FEC is a technique which was invented already
+in 1960 by Reed and Solomon and which is widely used for the parity
calculations of storage devices (RAID arrays). It is based on the
algebraic concept of finite fields, today called Galois fields, in
honour of the mathematician Galois (1811-1832). The FEC implementation
FEC parameters: The slice size, the number of data slices k, and the
total number of slices n. It is crucial to choose the slice size
such that no fragmentation of network packets takes place because
-FEC only guards against losses and reodering but fails if slices are
+FEC only guards against losses and reordering but fails if slices are
received partially.
FEC decoding in paralash is performed through the fecdec filter which
produce audio data. Paraslash writers operate on the client side and
are contained in para_audiod and in the stand-alone tool para_write.
-The para_write program reads uncompressed 16 bit audio data from
-STDIN. If this data starts with a wav header, sample rate and channel
-count are read from the header. Otherwise CD audio (44.1KHz stereo)
-is assumed but this can be overridden by command line options.
-para_audiod, on the other hand, obtains the sample rate and the number
-of channels from the decoder.
+The para_write program reads uncompressed audio data from STDIN. If
+this data starts with a wav header, sample rate, sample format and
+channel count are read from the header. Otherwise CD audio (44.1KHz
+16 bit little endian, stereo) is assumed but this can be overridden
+by command line options. para_audiod, on the other hand, obtains
+the sample rate and the number of channels from the decoder.
Like receivers and filters, each writer has an individual set of
command line options, and for para_audiod writers can be configured
it through a sound device. It is supported on all platforms and is
always compiled in.
+*AO*. _Libao_ is a cross-platform audio library which supports a wide
+variety of platforms including PulseAudio (gnome), ESD (Enlightened
+Sound Daemon), AIX, Solaris and IRIX. The ao writer plays audio
+through an output plugin of libao.
+
Examples
~~~~~~~~
para_audioc -- stat -p
-is executed, but this can be customized via the --stat_cmd option. In
+is executed, but this can be customized via the --stat-cmd option. In
particular it possible to use
para_client -- stat -p
paraslash development. It is necessary for cloning the git repository
and for getting updates.
-ftp://ftp.gnu.org/pub/gnu/gengetopt/ (gengetopt). The C code for
-the command line parsers of all paraslash executables is generated
-by gengetopt. The generated C files are shipped in the tarballs but
-are not contained in the git repository.
-
ftp://ftp.gnu.org/pub/gnu/m4/ (m4). Some input files for gengetopt
are generated from templates by the m4 macro processor.
Instead, a separate topic branch is forked from the tip of "master",
and it first is tested in isolation; Usually there are a handful such
topic branches that are running ahead of "master". The tip of these
-branches is not published in the public repository, to keep the number
+branches is not published in the public repository to keep the number
of branches that downstream developers need to worry about low.
The quality of topic branches varies widely. Some of them start out as
the tip of topic branches you are interested in from the output of
"git log next"). You should be able to safely build on top of them.
+However, at times "next" will be rebuilt from the tip of "master" to
+get rid of merge commits that will never be in "master". The commit
+that replaces "next" will usually have the identical tree, but it
+will have different ancestry from the tip of "master".
+
The "pu" (proposed updates) branch bundles the remainder of the
topic branches. The "pu" branch, and topic branches that are only in
"pu", are subject to rebasing in general. By the above definition
protocol, only minimal internal state about the connection is
maintained, which means that there is no protection against packet
loss or network congestion. Error checking and correction (if at all)
-are performed in the application.'
+are performed in the application.
*DCCP*. The _Datagram Congestion Control Protocol_ combines the
connection-oriented state maintenance known from TCP with the
projects / paraslash.git / blobdiff