Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GSoC IPPServer Functionality #120 #121 #122 #139

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

GSoC IPPServer Functionality #120 #121 #122 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f43e6c4
Merge pull request #1 from istopwg/master
aakashlahoti May 21, 2018
ddb287f
Merge remote-tracking branch 'upstream/master'
aakashlahoti Jun 12, 2018
81e6635
Added hexadecimal value reading functionality in parse_value() function
aakashlahoti Jun 12, 2018
1321fe3
Functionality for language over ride in textWithLanguage and nameWith…
aakashlahoti Jun 12, 2018
9446f88
Merge branch 'master' of https://github.com/istopwg/ippsample
aakashlahoti Jun 26, 2018
8aaba39
Changed for(int i=0; ;), to int i; for(i=0; ;)
aakashlahoti Jun 26, 2018
b86b9a8
Merge remote-tracking branch 'upstream/master'
aakashlahoti Jun 30, 2018
69cec5c
Merge remote-tracking branch 'upstream/master'
aakashlahoti Jul 19, 2018
abb1c46
Merge remote-tracking branch 'upstream/master'
aakashlahoti Jul 19, 2018
9cecef0
case LANG ipp-file.c/parse_value(), case STRING : hex support
aakashlahoti Jul 21, 2018
25873ac
Added support for capital hex values
aakashlahoti Jul 24, 2018
83b39b3
ippAddOctetString2() has been added for taking in non IPP_TAG_STRING …
aakashlahoti Jul 24, 2018
c976be5
Group_tag functionality added in _ippFileParse()
aakashlahoti Jul 24, 2018
faf04bf
Full Support for assigned data types
aakashlahoti Aug 1, 2018
6a1629e
Fixed a small error ipp-file.c line 475
aakashlahoti Aug 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 122 additions & 20 deletions cups/ipp-file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,22 +85,41 @@ _ippFileParse(
{
_ippVarsExpand(v, value, temp, sizeof(value));
_ippVarsSet(v, name, value);
}
}
}
else
{
report_error(&f, v, user_data, "Missing %s name and/or value on line %d of \"%s\".", token, f.linenum, f.filename);
break;
}
}
else if (f.attrs && !_cups_strcasecmp(token, "GROUP"))
{
char syntax[128]; /* Attribute syntax (value tag) */
ipp_tag_t group_tag; /* Group tag */

if (!_ippFileReadToken(&f, syntax, sizeof(syntax)))
{
report_error(&f, v, user_data, "Missing GROUP syntax on line %d of \"%s\".", f.linenum, f.filename);
break;
}
else if ((group_tag = ippTagValue(syntax)) > IPP_TAG_SYSTEM || group_tag < IPP_TAG_ZERO )
{
report_error(&f, v, user_data, "Bad GROUP syntax \"%s\" on line %d of \"%s\".", syntax, f.linenum, f.filename);
break;
}
f.group_tag = group_tag;
}

else if (f.attrs && !_cups_strcasecmp(token, "ATTR"))
{
/*
* Attribute definition...
*/

char syntax[128], /* Attribute syntax (value tag) */
name[128]; /* Attribute name */
name[128], /* Attribute name */
syntax_value[128]; /*Variable Expanded Value*/
ipp_tag_t value_tag; /* Value tag */

attr = NULL;
Expand All @@ -110,7 +129,9 @@ _ippFileParse(
report_error(&f, v, user_data, "Missing ATTR syntax on line %d of \"%s\".", f.linenum, f.filename);
break;
}
else if ((value_tag = ippTagValue(syntax)) < IPP_TAG_UNSUPPORTED_VALUE)
_ippVarsExpand(v, syntax_value, syntax, sizeof(syntax_value));

if ((value_tag = ippTagValue(syntax_value)) < IPP_TAG_UNSUPPORTED_VALUE)
{
report_error(&f, v, user_data, "Bad ATTR syntax \"%s\" on line %d of \"%s\".", syntax, f.linenum, f.filename);
break;
Expand Down Expand Up @@ -142,7 +163,7 @@ _ippFileParse(
attrs = ignored;
}

if (value_tag < IPP_TAG_INTEGER)
if (value_tag < IPP_TAG_INTEGER-1)
{
/*
* Add out-of-band attribute - no value string needed...
Expand All @@ -163,14 +184,15 @@ _ippFileParse(
}

}

else if (attr && !_cups_strcasecmp(token, ","))
{
/*
* Additional value...
*/

if (!parse_value(&f, v, user_data, attrs, &attr, ippGetCount(attr)))
break;
break;
}
else
{
Expand Down Expand Up @@ -357,15 +379,15 @@ _ippFileReadToken(_ipp_file_t *f, /* I - File to read from */

if ((ch = cupsFileGetChar(f->fp)) == EOF)
{
*token = '\0';
DEBUG_puts("1_ippFileReadToken: EOF");
return (0);
}
else if (ch == '\n')
{
f->linenum ++;
DEBUG_printf(("1_ippFileReadToken: quoted LF, linenum=%d, pos=%ld", f->linenum, (long)cupsFileTell(f->fp)));
}
*token = '\0';
DEBUG_puts("1_ippFileReadToken: EOF");
return (0);
}
else if (ch == '\n')
{
f->linenum ++;
DEBUG_printf(("1_ippFileReadToken: quoted LF, linenum=%d, pos=%ld", f->linenum, (long)cupsFileTell(f->fp)));
}
}

if (tokptr < tokend)
Expand Down Expand Up @@ -438,7 +460,8 @@ parse_collection(
*/

char syntax[128], /* Attribute syntax (value tag) */
name[128]; /* Attribute name */
name[128], /* Attribute name */
syntax_value[128]; /*Variable Expanded Value*/
ipp_tag_t value_tag; /* Value tag */

attr = NULL;
Expand All @@ -449,8 +472,10 @@ parse_collection(
ippDelete(col);
col = NULL;
break;

}
else if ((value_tag = ippTagValue(syntax)) < IPP_TAG_UNSUPPORTED_VALUE)
_ippVarsExpand(v, syntax_value, syntax, sizeof(syntax_value));
if ((value_tag = ippTagValue(syntax_value)) < IPP_TAG_UNSUPPORTED_VALUE)
{
report_error(f, v, user_data, "Bad ATTR syntax \"%s\" on line %d of \"%s\".", syntax, f->linenum, f->filename);
ippDelete(col);
Expand All @@ -466,7 +491,7 @@ parse_collection(
break;
}

if (value_tag < IPP_TAG_INTEGER)
if (value_tag < IPP_TAG_INTEGER-1)
{
/*
* Add out-of-band attribute - no value string needed...
Expand Down Expand Up @@ -537,6 +562,7 @@ parse_value(_ipp_file_t *f, /* I - IPP data file */
{
char value[1024], /* Value string */
temp[1024]; /* Temporary string */
ipp_tag_t value_tag;


if (!_ippFileReadToken(f, temp, sizeof(temp)))
Expand All @@ -547,7 +573,22 @@ parse_value(_ipp_file_t *f, /* I - IPP data file */

_ippVarsExpand(v, value, temp, sizeof(value));

switch (ippGetValueTag(*attr))
/* value_tag processing to support unassigned tag values */
value_tag = ippGetValueTag(*attr);
if (value_tag == 0x20 || (value_tag >= 0x24 && value_tag <= 0x2f))
value_tag = IPP_TAG_INTEGER;
else
if (value_tag >= 0x38 && value_tag <= 0x3f)
value_tag = IPP_TAG_STRING;
else
if (value_tag == 0x40 || (value_tag >= 0x4b && value_tag <= 0x5f))
value_tag = IPP_TAG_RESERVED_STRING;
else
if (value_tag >= 0x40000000 && value_tag <= 0x7fffffff)
value_tag = IPP_TAG_STRING;


switch (value_tag)
{
case IPP_TAG_BOOLEAN :
return (ippSetBoolean(ipp, attr, element, !_cups_strcasecmp(value, "true")));
Expand Down Expand Up @@ -587,7 +628,7 @@ parse_value(_ipp_file_t *f, /* I - IPP data file */
{
utc_offset = -utc_offset;
date[8] = (ipp_uchar_t)'-';
}
}
else
{
date[8] = (ipp_uchar_t)'+';
Expand Down Expand Up @@ -644,19 +685,80 @@ parse_value(_ipp_file_t *f, /* I - IPP data file */
break;

case IPP_TAG_STRING :
return (ippSetOctetString(ipp, attr, element, value, (int)strlen(value)));
{
if(value[0]=='<') /* Input is binary(in form of hex) values*/
{
unsigned char data[32767], *dataptr = data; /*data: decoded hex, dataptr:iterating pointer */
char *valptr = value + 1; /*Value iterating pointer*/
while (1)
{
while (isxdigit(valptr[0]) && isxdigit(valptr[1]))
{
char c = tolower(valptr[0]), d=tolower(valptr[1]);

/*decode hex pair into 8 bit string */
*dataptr = (d>='a')?(10+d-'a'):(d-'0') | (c>= 'a') ? ((10+c -'a') << 4) : ((c-'0') <<4);
valptr += 2;
dataptr ++;
if (dataptr >= (data + sizeof(data)))
break;
}
if (*valptr == '>')
break;
else if (*valptr) /*If string is not in pairs, or has a non-hex digit*/
{
report_error(f, v, user_data, "Bad hexadecimal value \"%s\" on line %d of \"%s\".", value+1, f->linenum, f->filename);
return (0);
}
if (!_ippFileReadToken(f, value, sizeof(value)))
{
report_error(f, v, user_data, "Missing value on line %d of \"%s\".", f->linenum, f->filename);
return (0);
}
valptr = value;
}
return (ippSetOctetString(ipp, attr, element, data, (int) (dataptr-data)));
}

else
{
return (ippSetOctetString(ipp, attr, element, value, (int)strlen(value)));

}
}

break;

case IPP_TAG_TEXTLANG :
case IPP_TAG_NAMELANG :
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use the same code for IPP_TAG_NAMELANG and IPP_TAG_TEXTLANG (with the two case statements together feeding into the same code).

(*attr)->values[element].string.text = _cupsStrAlloc(value);
if (!_ippFileReadToken(f, value, sizeof(value)))
{
report_error(f, v, user_data, "No Language Data in line %d of \"%s\".", f->linenum, f->filename);
return (0);
}
if (!(value[0] == '(' && value[strlen(value)-1] == ')'))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't you need to read another token here?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi!
For input like "my string"(language), the var, value, at line 695, initially contains 'my string' , which then is fed into string.text.
Next a token i.e. (language) is read into var value at line 696, which then is fed into string.language.
I don't think another token needs to be read here, is it ?

{
report_error(f, v, user_data, "Bad Language Value in line %d of \"%s\".", f->linenum, f->filename);
return (0);
}
memmove(value, value+1, strlen(value));
value[strlen(value)-1]='\0'; /* Purge parenthesis */
(*attr)->values[element].string.language = _cupsStrAlloc(value);

}
break;
case IPP_TAG_TEXT :
case IPP_TAG_NAME :
case IPP_TAG_RESERVED_STRING :
case IPP_TAG_KEYWORD :
case IPP_TAG_URI :
case IPP_TAG_URISCHEME :
case IPP_TAG_CHARSET :
case IPP_TAG_LANGUAGE :
case IPP_TAG_MIMETYPE :
case IPP_TAG_MEMBERNAME :
return (ippSetString(ipp, attr, element, value));
break;

Expand Down
73 changes: 68 additions & 5 deletions cups/ipp-support.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,28 @@ static const char * const ipp_std_ops[] =
"charset", /* 0x47 */
"naturalLanguage", /* 0x48 */
"mimeMediaType", /* 0x49 */
"memberAttrName" /* 0x4a */
"memberAttrName", /* 0x4a */
"0x4b", /* 0x4b */
"0x4c", /* 0x4c */
"0x4d", /* 0x4d */
"0x4e", /* 0x4e */
"0x4f", /* 0x4f */
"0x50", /* 0x50 */
"0x51", /* 0x51 */
"0x52", /* 0x52 */
"0x53", /* 0x53 */
"0x54", /* 0x54 */
"0x55", /* 0x55 */
"0x56", /* 0x56 */
"0x57", /* 0x57 */
"0x58", /* 0x58 */
"0x59", /* 0x59 */
"0x5a", /* 0x5a */
"0x5b", /* 0x5b */
"0x5c", /* 0x5c */
"0x5d", /* 0x5d */
"0x5e", /* 0x5e */
"0x5f" /* 0x5f */
};
static const char * const ipp_document_states[] =
{ /* document-state-enums */
Expand Down Expand Up @@ -2461,7 +2482,19 @@ ipp_tag_t /* O - Tag value */
ippTagValue(const char *name) /* I - Tag name */
{
size_t i; /* Looping var */

int itr, /* Name iterator*/
flag = 0, /*Integer detector*/
hex_val = 0; /*Convert hex to int */
for(itr = 0; itr < strlen(name) ; itr++)
{
if(!(name[itr] >= '0'&& name[itr]<='9'))
{
flag = 1;
break;
}
}
if(flag == 0)
return ((ipp_tag_t)atoi(name));

for (i = 0; i < (sizeof(ipp_tag_names) / sizeof(ipp_tag_names[0])); i ++)
if (!_cups_strcasecmp(name, ipp_tag_names[i]))
Expand Down Expand Up @@ -2489,9 +2522,39 @@ ippTagValue(const char *name) /* I - Tag name */
return (IPP_TAG_TEXT);
else if (!_cups_strcasecmp(name, "begCollection"))
return (IPP_TAG_BEGIN_COLLECTION);
else
return (IPP_TAG_ZERO);
}
else {
/* Detecting hex string of the form "0x********" between 0x40000000" and 0x7fffffff*/
flag = 0, itr = 0;
if(strlen(name) == 10 && name[0] == '0' && name [1]== 'x' )
{
hex_val = 0;
for(itr = 2; itr < strlen(name) ; itr++)
{
char c_flag = tolower(name[itr]);
if (!(( c_flag >= 'a' && c_flag <= 'f' )|| ( c_flag >= '0' && c_flag <= '9')))
{
flag = 1;
break;
}
else
{
hex_val = hex_val*16 + ((c_flag >= 'a' && c_flag <= 'f') ? (c_flag - 'a') : (c_flag - '0'));
}
}
if( flag == 0 && name[2] >= '4' && name[2] <= '7')
flag = 0;
else
flag = 1;
}
else
flag = 1;

if(flag == 0)
return hex_val;
else
return (IPP_TAG_ZERO);
}
}


/*
Expand Down
Loading