Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 90343
b: refs/heads/master
c: b1ec488
h: refs/heads/master
i:
  90341: ca04272
  90339: e3f2ae3
  90335: e86092c
v: v3
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Mar 26, 2008
1 parent d55255b commit ae7d949
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3d244121d88cd9b0baa12c25ff25561e7b4f71cd
refs/heads/master: b1ec488b1fb3c7a8819857e3506787516ca1ed4d
16 changes: 8 additions & 8 deletions trunk/net/netfilter/nf_conntrack_sip.c
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,10 @@ int ct_sip_lnlen(const char *line, const char *limit)
{
const char *k = line;

while ((line <= limit) && (*line == '\r' || *line == '\n'))
while ((line < limit) && (*line == '\r' || *line == '\n'))
line++;

while (line <= limit) {
while (line < limit) {
if (*line == '\r' || *line == '\n')
break;
line++;
Expand All @@ -211,7 +211,7 @@ const char *ct_sip_search(const char *needle, const char *haystack,
{
const char *limit = haystack + (haystack_len - needle_len);

while (haystack <= limit) {
while (haystack < limit) {
if (case_sensitive) {
if (strncmp(haystack, needle, needle_len) == 0)
return haystack;
Expand All @@ -229,7 +229,7 @@ static int digits_len(const struct nf_conn *ct, const char *dptr,
const char *limit, int *shift)
{
int len = 0;
while (dptr <= limit && isdigit(*dptr)) {
while (dptr < limit && isdigit(*dptr)) {
dptr++;
len++;
}
Expand All @@ -240,7 +240,7 @@ static int digits_len(const struct nf_conn *ct, const char *dptr,
static int skp_digits_len(const struct nf_conn *ct, const char *dptr,
const char *limit, int *shift)
{
for (; dptr <= limit && *dptr == ' '; dptr++)
for (; dptr < limit && *dptr == ' '; dptr++)
(*shift)++;

return digits_len(ct, dptr, limit, shift);
Expand Down Expand Up @@ -302,13 +302,13 @@ static int skp_epaddr_len(const struct nf_conn *ct, const char *dptr,
/* Search for @, but stop at the end of the line.
* We are inside a sip: URI, so we don't need to worry about
* continuation lines. */
while (dptr <= limit &&
while (dptr < limit &&
*dptr != '@' && *dptr != '\r' && *dptr != '\n') {
(*shift)++;
dptr++;
}

if (dptr <= limit && *dptr == '@') {
if (dptr < limit && *dptr == '@') {
dptr++;
(*shift)++;
} else {
Expand All @@ -332,7 +332,7 @@ int ct_sip_get_info(const struct nf_conn *ct,

limit = dptr + (dlen - hnfo->lnlen);

while (dptr <= limit) {
while (dptr < limit) {
if ((strncmp(dptr, hnfo->lname, hnfo->lnlen) != 0) &&
(hnfo->sname == NULL ||
strncmp(dptr, hnfo->sname, hnfo->snlen) != 0)) {
Expand Down

0 comments on commit ae7d949

Please sign in to comment.